Merge branch 'js/close-packs-before-gc' into HEAD

gitster · gitster · commit 1cfb225aba01 · 2016-05-18T14:40:09.000-07:00
* js/close-packs-before-gc:
  t5510: run auto-gc in the foreground
diff --git 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
 	)

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '`
`682`	`682`	`(`
`683`	`683`	`cd auto-gc &&`
`684`	`684`	`git config gc.autoPackLimit 1 &&`
	`685`	`+ git config gc.autoDetach false &&`
`685`	`686`	`GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&`
`686`	`687`	`! grep "Should I try again" fetch.out`
`687`	`688`	`)`