merge-octopus: abort if index does not match HEAD

diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index fc57e7d3fd69c60144ee3fb3f66b252a67369b42..05ddc69cf2ad9470a125fda47fc450401f94902b 100755 (executable)
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -10,15 +10,15 @@ test_expect_success setup '
        echo >subdir/fileB fileB &&
        git add fileA subdir/fileB &&
        git commit -a -m "Initial in one history." &&
-       A0=`git rev-parse --verify HEAD` &&
+       A0=$(git rev-parse --verify HEAD) &&
 
        echo >fileA fileA modified &&
        git commit -a -m "Second in one history." &&
-       A1=`git rev-parse --verify HEAD` &&
+       A1=$(git rev-parse --verify HEAD) &&
 
        echo >subdir/fileB fileB modified &&
        git commit -a -m "Third in one history." &&
-       A2=`git rev-parse --verify HEAD` &&
+       A2=$(git rev-parse --verify HEAD) &&
 
        rm -f .git/refs/heads/master .git/index &&
 
@@ -26,15 +26,15 @@ test_expect_success setup '
        echo >subdir/fileB fileB again &&
        git add fileA subdir/fileB &&
        git commit -a -m "Initial in alternate history." &&
-       B0=`git rev-parse --verify HEAD` &&
+       B0=$(git rev-parse --verify HEAD) &&
 
        echo >fileA fileA modified in alternate history &&
        git commit -a -m "Second in alternate history." &&
-       B1=`git rev-parse --verify HEAD` &&
+       B1=$(git rev-parse --verify HEAD) &&
 
        echo >subdir/fileB fileB modified in alternate history &&
        git commit -a -m "Third in alternate history." &&
-       B2=`git rev-parse --verify HEAD` &&
+       B2=$(git rev-parse --verify HEAD) &&
        : done
 '
 
@@ -90,22 +90,22 @@ check () {
 for type in basic parents parents-raw
 do
        test_expect_success 'without grafts' "
-               rm -f .git/info/grafts
+               rm -f .git/info/grafts &&
                check $type $B2 -- $B2 $B1 $B0
        "
 
        test_expect_success 'with grafts' "
-               echo '$B0 $A2' >.git/info/grafts
+               echo '$B0 $A2' >.git/info/grafts &&
                check $type $B2 -- $B2 $B1 $B0 $A2 $A1 $A0
        "
 
        test_expect_success 'without grafts, with pathlimit' "
-               rm -f .git/info/grafts
+               rm -f .git/info/grafts &&
                check $type $B2 subdir -- $B2 $B0
        "
 
        test_expect_success 'with grafts, with pathlimit' "
-               echo '$B0 $A2' >.git/info/grafts
+               echo '$B0 $A2' >.git/info/grafts &&
                check $type $B2 subdir -- $B2 $B0 $A2 $A0
        "