diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:38 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:38 (GMT) |
commit | 48794acc50f14394ca6c4f5092a4a498f409f350 (patch) | |
tree | 8e3a6130340ff7a54fc8c99443501ba2ec1453c1 /t/t5514-fetch-multiple.sh | |
parent | e1cfff676549cdcd702cbac105468723ef2722f4 (diff) | |
parent | 25914c4fdeefd99b06e134496dfb9bbb58a5c417 (diff) | |
download | git-48794acc50f14394ca6c4f5092a4a498f409f350.zip git-48794acc50f14394ca6c4f5092a4a498f409f350.tar.gz git-48794acc50f14394ca6c4f5092a4a498f409f350.tar.bz2 |
Merge branch 'ds/maintenance-part-1'
A "git gc"'s big brother has been introduced to take care of more
repository maintenance tasks, not limited to the object database
cleaning.
* ds/maintenance-part-1:
maintenance: add trace2 regions for task execution
maintenance: add auto condition for commit-graph task
maintenance: use pointers to check --auto
maintenance: create maintenance.<task>.enabled config
maintenance: take a lock on the objects directory
maintenance: add --task option
maintenance: add commit-graph task
maintenance: initialize task array
maintenance: replace run_auto_gc()
maintenance: add --quiet option
maintenance: create basic maintenance runner
Diffstat (limited to 't/t5514-fetch-multiple.sh')
-rwxr-xr-x | t/t5514-fetch-multiple.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index de8e2f1..bd202ec 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 ) ' |