summaryrefslogtreecommitdiff
path: root/t
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)
commit99913dd11809b2a5d6a4644c52bc795d124d48e0 (patch)
tree1031108154d09f1dff07b9a8799221be3597e083 /t
parentf2e2136ad7291524a2b67a179dea493f4a562453 (diff)
parentfec2ed21871c73d5212f5c8843d250eb7d5a649c (diff)
downloadgit-99913dd11809b2a5d6a4644c52bc795d124d48e0.zip
git-99913dd11809b2a5d6a4644c52bc795d124d48e0.tar.gz
git-99913dd11809b2a5d6a4644c52bc795d124d48e0.tar.bz2
Merge branch 'jn/gc-auto-prep'
Code clean-up. * jn/gc-auto-prep: gc: exit with status 128 on failure gc: improve handling of errors reading gc.log
Diffstat (limited to 't')
-rwxr-xr-xt/t6500-gc.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index b3fbd87..76a2d25 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -138,7 +138,7 @@ test_expect_success 'background auto gc does not run if gc.log is present and re
test_config gc.autodetach true &&
echo fleem >.git/gc.log &&
test_must_fail git gc --auto 2>err &&
- test_i18ngrep "^error:" err &&
+ test_i18ngrep "^fatal:" err &&
test_config gc.logexpiry 5.days &&
test-tool chmtime =-345600 .git/gc.log &&
test_must_fail git gc --auto &&