Skip to content

Commit

Permalink
t3406: simplify an already simple test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
newren authored and gitster committed Feb 16, 2020
1 parent e98c426 commit 7db00f0
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions t/t3406-rebase-message.sh
Expand Up @@ -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' '
Expand Down

0 comments on commit 7db00f0

Please sign in to comment.