merge-octopus: abort if index does not match HEAD

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 0c10c856a96072a1b0c37530a9f5c8605d8833b5..38321d19efbee0da62a9327f5849521093fbe077 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -679,10 +679,12 @@ test_expect_success 'fetching with auto-gc does not lock up' '
        EOF
        git clone "file://$D" auto-gc &&
        test_commit test2 &&
-       cd auto-gc &&
-       git config gc.autoPackLimit 1 &&
-       GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
-       ! grep "Should I try again" fetch.out
+       (
+               cd auto-gc &&
+               git config gc.autoPackLimit 1 &&
+               GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
+               ! grep "Should I try again" fetch.out
+       )
 '
 
 test_done