]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t3406: simplify an already simple test
authorElijah Newren <newren@gmail.com>
Sat, 15 Feb 2020 21:36:26 +0000 (21:36 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Feb 2020 23:40:42 +0000 (15:40 -0800)
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>
t/t3406-rebase-message.sh

index b393e1e9fee88bb9b3df6ecc8544dfa370086e41..0c2c569f9591140b77880b1c4c0ab74723e68e22 100755 (executable)
@@ -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' '