t3407: strengthen rebase --abort tests

The existing tests only check that HEAD points to the correct
commit after aborting, they do not check that the original branch
is checked out.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 7eba9ec1619ca94263c86b4d1e733c2aba9f6d1d..f8264449b6c32b73e0f3680ef3aa18fa4f1cd499 100755 (executable)
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -19,6 +19,13 @@ test_expect_success setup '
        test_commit "merge should fail on this, too" a e pre-rebase
 '
 
+# Check that HEAD is equal to "pre-rebase" and the current branch is
+# "to-rebase"
+check_head() {
+       test_cmp_rev HEAD pre-rebase &&
+       test "$(git symbolic-ref HEAD)" = refs/heads/to-rebase
+}
+
 testrebase() {
        type=$1
        state_dir=$2
@@ -29,7 +36,7 @@ testrebase() {
                test_must_fail git rebase$type main &&
                test_path_is_dir "$state_dir" &&
                git rebase --abort &&
-               test_cmp_rev to-rebase pre-rebase &&
+               check_head &&
                test_path_is_missing "$state_dir"
        '
 
@@ -41,7 +48,7 @@ testrebase() {
                test_must_fail git rebase --skip &&
                test_cmp_rev HEAD main &&
                git rebase --abort &&
-               test_cmp_rev to-rebase pre-rebase &&
+               check_head &&
                test_path_is_missing "$state_dir"
        '
 
@@ -56,7 +63,7 @@ testrebase() {
                test_must_fail git rebase --continue &&
                test_cmp_rev ! HEAD main &&
                git rebase --abort &&
-               test_cmp_rev to-rebase pre-rebase &&
+               check_head &&
                test_path_is_missing "$state_dir"
        '