From: Patrick Steinhardt Date: Mon, 11 May 2026 12:29:56 GMT Subject: [PATCH 2/2] run-command: honor "gc.auto" for auto-maintenance 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 Signed-off-by: Patrick Steinhardt --- 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