Merge branch 'js/rebase-autostash-fix'

[git/git.git] / t / t3420-rebase-autostash.sh

diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 001d624..f355c68 100755 (executable)
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -202,7 +202,7 @@ testrebase () {
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&

-               ! grep dirty file3 &&
+               test_path_is_missing file3 &&

                rm -rf $dotest &&
                git reset --hard &&
                git checkout feature-branch
                rm -rf $dotest &&
                git reset --hard &&
                git checkout feature-branch


@@ -216,7 +216,7 @@ testrebase () {
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&

-               ! grep dirty file3 &&
+               test_path_is_missing file3 &&

                echo "conflicting-plus-goodbye" >file2 &&
                git add file2 &&
                git rebase --continue &&
                echo "conflicting-plus-goodbye" >file2 &&
                git add file2 &&
                git rebase --continue &&


@@ -233,7 +233,7 @@ testrebase () {
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&

-               ! grep dirty file3 &&
+               test_path_is_missing file3 &&

                git rebase --skip &&
                test_path_is_missing $dotest/autostash &&
                grep dirty file3 &&
                git rebase --skip &&
                test_path_is_missing $dotest/autostash &&
                grep dirty file3 &&


@@ -248,7 +248,7 @@ testrebase () {
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&
                echo dirty >>file3 &&
                test_must_fail git rebase$type related-onto-branch &&
                test_path_is_file $dotest/autostash &&

-               ! grep dirty file3 &&
+               test_path_is_missing file3 &&

                git rebase --abort &&
                test_path_is_missing $dotest/autostash &&
                grep dirty file3 &&
                git rebase --abort &&
                test_path_is_missing $dotest/autostash &&
                grep dirty file3 &&