[PATCH 2/2] run-command: honor "gc.auto" for auto-maintenance
- From
Patrick Steinhardt <ps@pks.im>
- Date
- May 11, 2026, 12:29 UTC
- Message-ID
- <20260511-pks-maintenance-fix-lock-with-detach-v1-2-ccd7d62c9a40@pks.im>
- In-Reply-To
- <20260511-pks-maintenance-fix-lock-with-detach-v1-0-ccd7d62c9a40@pks.im>
The "gc.auto" configuration has traditionally been used to turn off running git-gc(1) as part of our auto-maintenance. We have eventually switched over to git-maintenance(1) in a95ce12430 (maintenance: replace run_auto_gc(), 2020-09-17), and with 1942d48380 (maintenance: optionally skip --auto process, 2020-08-28) we have introduced "maintenance.auto" to control whether or not to run auto-maintenance.
At that point though we still shelled out to git-gc(1) internally. So if "gc.auto=0" was set we would still _execute_ git-maintenance(1), but the command would have exited fast because git-gc(1) itself knew to honor the config key.
This has recently changed though, as we have adapted the default maintenance strategy to not use git-gc(1) anymore. The consequence is that "gc.auto=0" doesn't have an effect anymore, which is a somewhat surprising change in behaviour for our users.
Adapt `run_auto_maintenance()` so that it knows to also read "gc.auto", similar to how it also reads both "maintenance.autoDetach" and "gc.autoDetach".
Reported-by: Jean-Christophe Manciot <actionmystique@gmail.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> --- run-command.c | 6 ++++-- t/t7900-maintenance.sh | 37 ++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/run-command.c b/run-command.c index c146a56532..1e7b789010 100644 --- a/run-command.c +++ b/run-command.c @@ -1946,8 +1946,10 @@ int prepare_auto_maintenance(struct repository *r, int quiet, { int enabled, auto_detach; - if (!repo_config_get_bool(r, "maintenance.auto", &enabled) && - !enabled) + if (repo_config_get_bool(r, "maintenance.auto", &enabled) && + repo_config_get_bool(r, "gc.auto", &enabled)) + enabled = 1; + if (!enabled) return 0; /* diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index df0bbc1669..1f70462678 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -60,17 +60,32 @@ test_expect_success 'run [--auto|--quiet] with gc strategy' ' test_subcommand git gc --no-quiet --no-detach --skip-foreground-tasks <run-no-quiet.txt ' -test_expect_success 'maintenance.auto config option' ' - GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 && - test_subcommand git maintenance run --auto --quiet --detach <default && - GIT_TRACE2_EVENT="$(pwd)/true" \ - git -c maintenance.auto=true \ - commit --quiet --allow-empty -m 2 && - test_subcommand git maintenance run --auto --quiet --detach <true && - GIT_TRACE2_EVENT="$(pwd)/false" \ - git -c maintenance.auto=false \ - commit --quiet --allow-empty -m 3 && - test_subcommand ! git maintenance run --auto --quiet --detach <false +for cfg in maintenance.auto gc.auto +do + test_expect_success "$cfg config option" ' + GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 && + test_subcommand git maintenance run --auto --quiet --detach <default && + GIT_TRACE2_EVENT="$(pwd)/true" \ + git -c $cfg=true commit --quiet --allow-empty -m 2 && + test_subcommand git maintenance run --auto --quiet --detach <true && + GIT_TRACE2_EVENT="$(pwd)/false" \ + git -c $cfg=false commit --quiet --allow-empty -m 3 && + test_subcommand ! git maintenance run --auto --quiet --detach <false + ' +done + +test_expect_success "maintenance.auto overrides gc.auto" ' + test_when_finished "rm -f trace" && + + test_config maintenance.auto false && + test_config gc.auto true && + GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 && + test_subcommand ! git maintenance run --auto --quiet --detach <trace && + + test_config maintenance.auto true && + test_config gc.auto false && + GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 && + test_subcommand git maintenance run --auto --quiet --detach <trace ' for cfg in maintenance.autoDetach gc.autoDetach
-- 2.54.0.545.g6539524ca2.dirty