@matheusbsbs / matheus-bagliano / commits / 29364f1624

run-command: honor "gc.auto" for auto-maintenance

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed May 13, 2026 at 09:31 UTC 29364f16242abd490160f66d2d239ac45e1d45fb
2 files changed +32 -3
run-command.c
+7 -3
@@ -1944,10 +1944,14 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
1944 int prepare_auto_maintenance(struct repository *r, int quiet,
1945 struct child_process *maint)
1946 {
1947 - int enabled, auto_detach;
1947 + int enabled = 1, auto_detach;
1948
1949 - if (!repo_config_get_bool(r, "maintenance.auto", &enabled) &&
1950 - !enabled)
1949 + if (repo_config_get_bool(r, "maintenance.auto", &enabled)) {
1950 + int gc_threshold;
1951 + if (!repo_config_get_int(r, "gc.auto", &gc_threshold))
1952 + enabled = gc_threshold > 0;
1953 + }
1954 + if (!enabled)
1955 return 0;
1956
1957 /*
t/t7900-maintenance.sh
+25
@@ -73,6 +73,31 @@ test_expect_success 'maintenance.auto config option' '
73 test_subcommand ! git maintenance run --auto --quiet --detach <false
74 '
75
76 +test_expect_success 'gc.auto config option' '
77 + GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
78 + test_subcommand git maintenance run --auto --quiet --detach <default &&
79 + GIT_TRACE2_EVENT="$(pwd)/true" \
80 + git -c gc.auto=1 commit --quiet --allow-empty -m 2 &&
81 + test_subcommand git maintenance run --auto --quiet --detach <true &&
82 + GIT_TRACE2_EVENT="$(pwd)/false" \
83 + git -c gc.auto=0 commit --quiet --allow-empty -m 3 &&
84 + test_subcommand ! git maintenance run --auto --quiet --detach <false
85 +'
86 +
87 +test_expect_success 'maintenance.auto overrides gc.auto' '
88 + test_when_finished "rm -f trace" &&
89 +
90 + test_config maintenance.auto false &&
91 + test_config gc.auto 1 &&
92 + GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
93 + test_subcommand ! git maintenance run --auto --quiet --detach <trace &&
94 +
95 + test_config maintenance.auto true &&
96 + test_config gc.auto 0 &&
97 + GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
98 + test_subcommand git maintenance run --auto --quiet --detach <trace
99 +'
100 +
101 for cfg in maintenance.autoDetach gc.autoDetach
102 do
103 test_expect_success "$cfg=true config option" '