Imported Upstream version 2.27.0

[platform/upstream/git.git] / t / t3406-rebase-message.sh

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 61b76f3..927a4f4 100755 (executable)
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -89,22 +89,22 @@ test_expect_success 'GIT_REFLOG_ACTION' '
        git checkout -b reflog-topic start &&
        test_commit reflog-to-rebase &&
 
-       git rebase --apply reflog-onto &&
+       git rebase reflog-onto &&
        git log -g --format=%gs -3 >actual &&
        cat >expect <<-\EOF &&
-       rebase finished: returning to refs/heads/reflog-topic
-       rebase: reflog-to-rebase
-       rebase: checkout reflog-onto
+       rebase (finish): returning to refs/heads/reflog-topic
+       rebase (pick): reflog-to-rebase
+       rebase (start): checkout reflog-onto
        EOF
        test_cmp expect actual &&
 
        git checkout -b reflog-prefix reflog-to-rebase &&
-       GIT_REFLOG_ACTION=change-the-reflog git rebase --apply reflog-onto &&
+       GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
        git log -g --format=%gs -3 >actual &&
        cat >expect <<-\EOF &&
-       rebase finished: returning to refs/heads/reflog-prefix
-       change-the-reflog: reflog-to-rebase
-       change-the-reflog: checkout reflog-onto
+       change-the-reflog (finish): returning to refs/heads/reflog-prefix
+       change-the-reflog (pick): reflog-to-rebase
+       change-the-reflog (start): checkout reflog-onto
        EOF
        test_cmp expect actual
 '