t5703: replace "grep -a" usage by perl

[thirdparty/git.git] / t / t3427-rebase-subtree.sh

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index bec48e6a1f99a5d5db91b392987ff5b64cf16781..79e43a370baca27bdf2945e8d2ec1402516dfcdd 100755 (executable)
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -85,23 +85,23 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --
        verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
-test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
        reset_rebase &&
        git checkout -b rebase-onto to-rebase &&
-       test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
+       test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&
        : first pick results in no changes &&
-       git rebase --continue &&
+       git rebase --skip &&
        verbose test "$(commit_message HEAD~2)" = "master4" &&
        verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
        verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
-test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
        reset_rebase &&
        git checkout -b rebase-merges-onto to-rebase &&
-       test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
+       test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&
        : first pick results in no changes &&
-       git rebase --continue &&
+       git rebase --skip &&
        verbose test "$(commit_message HEAD~2)" = "master4" &&
        verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
        verbose test "$(commit_message HEAD)" = "Empty commit"