diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2020-09-17 20:11:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-17 20:30:05 +0200 |
| commit | 916d0626c202c18e6d615abb69ba1f15b335c3ea (patch) | |
| tree | 3a052dc0dcd5fbbcac543265fddd76b15f0e3a23 /t | |
| parent | maintenance: create maintenance.<task>.enabled config (diff) | |
| download | git-916d0626c202c18e6d615abb69ba1f15b335c3ea.tar.xz git-916d0626c202c18e6d615abb69ba1f15b335c3ea.zip | |
maintenance: use pointers to check --auto
The 'git maintenance run' command has an '--auto' option. This is used
by other Git commands such as 'git commit' or 'git fetch' to check if
maintenance should be run after adding data to the repository.
Previously, this --auto option was only used to add the argument to the
'git gc' command as part of the 'gc' task. We will be expanding the
other tasks to perform a check to see if they should do work as part of
the --auto flag, when they are enabled by config.
First, update the 'gc' task to perform the auto check inside the
maintenance process. This prevents running an extra 'git gc --auto'
command when not needed. It also shows a model for other tasks.
Second, use the 'auto_condition' function pointer as a signal for
whether we enable the maintenance task under '--auto'. For instance, we
do not want to enable the 'fetch' task in '--auto' mode, so that
function pointer will remain NULL.
Now that we are not automatically calling 'git gc', a test in
t5514-fetch-multiple.sh must be changed to watch for 'git maintenance'
instead.
We continue to pass the '--auto' option to the 'git gc' command when
necessary, because of the gc.autoDetach config option changes behavior.
Likely, we will want to absorb the daemonizing behavior implied by
gc.autoDetach as a maintenance.autoDetach config option.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5514-fetch-multiple.sh | 2 | ||||
| -rwxr-xr-x | t/t7900-maintenance.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index de8e2f1531..bd202ec6f3 100755 --- a/t/t5514-fetch-multiple.sh +++ b/t/t5514-fetch-multiple.sh @@ -108,7 +108,7 @@ test_expect_success 'git fetch --multiple (two remotes)' ' GIT_TRACE=1 git fetch --multiple one two 2>trace && git branch -r > output && test_cmp ../expect output && - grep "built-in: git gc" trace >gc && + grep "built-in: git maintenance" trace >gc && test_line_count = 1 gc ) ' diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 8a162a18ba..53c883531e 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -23,7 +23,7 @@ test_expect_success 'run [--auto|--quiet]' ' GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \ git maintenance run --no-quiet 2>/dev/null && test_subcommand git gc --quiet <run-no-auto.txt && - test_subcommand git gc --auto --quiet <run-auto.txt && + test_subcommand ! git gc --auto --quiet <run-auto.txt && test_subcommand git gc --no-quiet <run-no-quiet.txt ' |