summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:09 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:09 -0700
commit1cfb225aba01c74d60f4984dd1824f3c7f054beb (patch)
treeffeb0da6d7cf99dd53731d86a258b1197ca93113
parent803fd70ceee3b86861d8b09b27861c4f85828b82 (diff)
parentbb05510e55796194540ed4e50a62771489c59a04 (diff)
downloadgit-1cfb225aba01c74d60f4984dd1824f3c7f054beb.tar.gz
Merge branch 'js/close-packs-before-gc' into HEAD
* js/close-packs-before-gc: t5510: run auto-gc in the foreground
-rwxr-xr-xt/t5510-fetch.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 38321d19ef..454d896390 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -682,6 +682,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
(
cd auto-gc &&
git config gc.autoPackLimit 1 &&
+ git config gc.autoDetach false &&
GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
! grep "Should I try again" fetch.out
)