From: Junio C Hamano <redacted>
Date: Wed, 18 Nov 2020 21:32:53 +0000 (-0800)
Subject: Merge branch 'ds/maintenance-part-3'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7660da161821ab79b8ecd5019c28843ed7e770a6;p=git.git

Merge branch 'ds/maintenance-part-3'

Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.

* ds/maintenance-part-3:
  maintenance: add troubleshooting guide to docs
  maintenance: use 'incremental' strategy by default
  maintenance: create maintenance.strategy config
  maintenance: add start/stop subcommands
  maintenance: add [un]register subcommands
  for-each-repo: run subcommands on configured repos
  maintenance: add --schedule option and config
  maintenance: optionally skip --auto process
---

7660da161821ab79b8ecd5019c28843ed7e770a6
diff --cc t/test-lib.sh
index fa347ed3e1,4a60d1ed76..a863ccee7e
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -1711,10 -1702,9 +1711,17 @@@ test_lazy_prereq SHA1 
  test_lazy_prereq REBASE_P '
  	test -z "$GIT_TEST_SKIP_REBASE_P"
  '
+ 
 +# Special-purpose prereq for transitioning to a new default branch name:
 +# Some tests need more than just a mindless (case-preserving) s/master/main/g
 +# replacement. The non-trivial adjustments are guarded behind this
 +# prerequisite, acting kind of as a feature flag
 +test_lazy_prereq PREPARE_FOR_MAIN_BRANCH '
 +	test "$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME" = main
 +'
++
+ # Ensure that no test accidentally triggers a Git command
+ # that runs 'crontab', affecting a user's cron schedule.
+ # Tests that verify the cron integration must set this locally
+ # to avoid errors.
+ GIT_TEST_CRONTAB="exit 1"