From: Elijah Newren Date: Sat, 15 Feb 2020 21:36:26 +0000 (+0000) Subject: t3406: simplify an already simple test X-Git-Tag: v2.26.0-rc0~24^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7db00f0b3bc2c0bde616d45cf6e3a130e74e3024;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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' '