diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:26 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
| commit | 7db00f0b3bc2c0bde616d45cf6e3a130e74e3024 (patch) | |
| tree | 050e40ceb9a56bd95c97ef6ab64cc086ac214555 | |
| parent | rebase (interactive-backend): fix handling of commits that become empty (diff) | |
| download | tgif-7db00f0b3bc2c0bde616d45cf6e3a130e74e3024.tar.xz | |
t3406: simplify an already simple test
When the merge backend was re-implemented on top of the interactive
backend, the output of rebase --merge changed a little. This change
allowed this test to be simplified, though it wasn't noticed until now.
Simplify the testcase a little.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3406-rebase-message.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index b393e1e9fe..0c2c569f95 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -18,11 +18,8 @@ test_expect_success 'setup' ' ' test_expect_success 'rebase -m' ' - git rebase -m master >report && - >expect && - sed -n -e "/^Already applied: /p" \ - -e "/^Committed: /p" report >actual && - test_cmp expect actual + git rebase -m master >actual && + test_must_be_empty actual ' test_expect_success 'rebase against master twice' ' |