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>
Elijah Newren committed
Feb 15, 2020 at 21:36 UTC
7db00f0b3bc2c0bde616d45cf6e3a130e74e3024
1 file changed
+2
-5
t/t3406-rebase-message.sh
+2
-5
@@ -18,11 +18,8 @@ test_expect_success 'setup' '
18
'
19
20
test_expect_success 'rebase -m' '
21
- git rebase -m master >report &&
22
- >expect &&
23
- sed -n -e "/^Already applied: /p" \
24
- -e "/^Committed: /p" report >actual &&
25
- test_cmp expect actual
21
+ git rebase -m master >actual &&
22
+ test_must_be_empty actual
23
'
24
25
test_expect_success 'rebase against master twice' '