diff options
Diffstat (limited to 'third_party/git/t/t3406-rebase-message.sh')
| -rwxr-xr-x | third_party/git/t/t3406-rebase-message.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/third_party/git/t/t3406-rebase-message.sh b/third_party/git/t/t3406-rebase-message.sh index 61b76f330198..b393e1e9fee8 100755 --- a/third_party/git/t/t3406-rebase-message.sh +++ b/third_party/git/t/t3406-rebase-message.sh @@ -18,29 +18,32 @@ test_expect_success 'setup' ' ' test_expect_success 'rebase -m' ' - git rebase -m master >actual && - test_must_be_empty actual + git rebase -m master >report && + >expect && + sed -n -e "/^Already applied: /p" \ + -e "/^Committed: /p" report >actual && + test_cmp expect actual ' test_expect_success 'rebase against master twice' ' - git rebase --apply master >out && + git rebase master >out && test_i18ngrep "Current branch topic is up to date" out ' test_expect_success 'rebase against master twice with --force' ' - git rebase --force-rebase --apply master >out && + git rebase --force-rebase master >out && test_i18ngrep "Current branch topic is up to date, rebase forced" out ' test_expect_success 'rebase against master twice from another branch' ' git checkout topic^ && - git rebase --apply master topic >out && + git rebase master topic >out && test_i18ngrep "Current branch topic is up to date" out ' test_expect_success 'rebase fast-forward to master' ' git checkout topic^ && - git rebase --apply topic >out && + git rebase topic >out && test_i18ngrep "Fast-forwarded HEAD to topic" out ' @@ -89,7 +92,7 @@ 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 @@ -99,7 +102,7 @@ test_expect_success 'GIT_REFLOG_ACTION' ' 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 |