revert: Introduce --reset to remove sequencer state

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index b372314a1094cd9ab99d2aa7aa592875bc0fe226..47c8371c7edfe7945ded380bb6f96a00d26c04eb 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -7,34 +7,39 @@ test_description='git rebase interactive
 
 This test runs git rebase "interactively", by faking an edit, and verifies
 that the result still makes sense.
+
+Initial setup:
+
+     one - two - three - four (conflict-branch)
+   /
+ A - B - C - D - E            (master)
+ | \
+ |   F - G - H                (branch1)
+ |     \
+ |\      I                    (branch2)
+ | \
+ |   J - K - L - M            (no-conflict-branch)
+  \
+    N - O - P                 (no-ff-branch)
+
+ where A, B, D and G all touch file1, and one, two, three, four all
+ touch file "conflict".
 '
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
+test_cmp_rev () {
+       git rev-parse --verify "$1" >expect.rev &&
+       git rev-parse --verify "$2" >actual.rev &&
+       test_cmp expect.rev actual.rev
+}
+
 set_fake_editor
 
-# Set up the repository like this:
-#
-#     one - two - three - four (conflict-branch)
-#   /
-# A - B - C - D - E            (master)
-# | \
-# |   F - G - H                (branch1)
-# |     \
-# |\      I                    (branch2)
-# | \
-# |   J - K - L - M            (no-conflict-branch)
-#  \
-#    N - O - P                 (no-ff-branch)
-#
-# where A, B, D and G all touch file1, and one, two, three, four all
-# touch file "conflict".
-#
 # WARNING: Modifications to the initial repository can change the SHA ID used
 # in the expect2 file for the 'stop on conflicting pick' test.
 
-
 test_expect_success 'setup' '
        test_commit A file1 &&
        test_commit B file1 &&
@@ -66,8 +71,9 @@ test_expect_success 'setup' '
 # "exec" commands are ran with the user shell by default, but this may
 # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
 # to create a file. Unseting SHELL avoids such non-portable behavior
-# in tests.
+# in tests. It must be exported for it to take effect where needed.
 SHELL=
+export SHELL
 
 test_expect_success 'rebase -i with the exec command' '
        git checkout master &&
@@ -81,20 +87,12 @@ test_expect_success 'rebase -i with the exec command' '
        test_path_is_file touch-one &&
        test_path_is_file touch-two &&
        test_path_is_missing touch-three " (should have stopped before)" &&
-       test $(git rev-parse C) = $(git rev-parse HEAD) || {
-               echo "Stopped at wrong revision:"
-               echo "($(git describe --tags HEAD) instead of C)"
-               false
-       } &&
+       test_cmp_rev C HEAD &&
        git rebase --continue &&
        test_path_is_file touch-three &&
        test_path_is_file "touch-file  name with spaces" &&
        test_path_is_file touch-after-semicolon &&
-       test $(git rev-parse master) = $(git rev-parse HEAD) || {
-               echo "Stopped at wrong revision:"
-               echo "($(git describe --tags HEAD) instead of master)"
-               false
-       } &&
+       test_cmp_rev master HEAD &&
        rm -f touch-*
 '
 
@@ -115,11 +113,7 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
        export FAKE_LINES &&
        test_must_fail git rebase -i HEAD^
        ) &&
-       test $(git rev-parse master^) = $(git rev-parse HEAD) || {
-               echo "Stopped at wrong revision:"
-               echo "($(git describe --tags HEAD) instead of master^)"
-               false
-       } &&
+       test_cmp_rev master^ HEAD &&
        git reset --hard &&
        git rebase --continue
 '
@@ -323,7 +317,7 @@ test_expect_success '--continue tries to commit' '
 '
 
 test_expect_success 'verbose flag is heeded, even after --continue' '
-       git reset --hard HEAD@{1} &&
+       git reset --hard master@{1} &&
        test_tick &&
        test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
        echo resolved > file1 &&
@@ -654,6 +648,7 @@ test_expect_success 'rebase -i can copy notes' '
 
 cat >expect <<EOF
 an earlier note
+
 a note
 EOF