summaryrefslogtreecommitdiff
path: root/t/t6500-gc.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:02 (GMT)
commit993fa5625876306ff1de0cbc5d70fc1b232568b9 (patch)
tree3b189efca15713a184fa054404745626d9306c6b /t/t6500-gc.sh
parent99913dd11809b2a5d6a4644c52bc795d124d48e0 (diff)
parent3029970275b473dbf62149887a19a6b4879528d7 (diff)
downloadgit-993fa5625876306ff1de0cbc5d70fc1b232568b9.zip
git-993fa5625876306ff1de0cbc5d70fc1b232568b9.tar.gz
git-993fa5625876306ff1de0cbc5d70fc1b232568b9.tar.bz2
Merge branch 'jn/gc-auto'
"gc --auto" ended up calling exit(-1) upon error, which has been corrected to use exit(1). Also the error reporting behaviour when daemonized has been updated to exit with zero status when stopping due to a previously discovered error (which implies there is no point running gc to improve the situation); we used to exit with failure in such a case. * jn/gc-auto: gc: do not return error for prior errors in daemonized mode
Diffstat (limited to 't/t6500-gc.sh')
-rwxr-xr-xt/t6500-gc.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 76a2d25..4684d06 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -137,11 +137,11 @@ test_expect_success 'background auto gc does not run if gc.log is present and re
test_config gc.autopacklimit 1 &&
test_config gc.autodetach true &&
echo fleem >.git/gc.log &&
- test_must_fail git gc --auto 2>err &&
- test_i18ngrep "^fatal:" err &&
+ git gc --auto 2>err &&
+ test_i18ngrep "^warning:" err &&
test_config gc.logexpiry 5.days &&
test-tool chmtime =-345600 .git/gc.log &&
- test_must_fail git gc --auto &&
+ git gc --auto &&
test_config gc.logexpiry 2.days &&
run_and_wait_for_auto_gc &&
ls .git/objects/pack/pack-*.pack >packs &&