t3406: simplify an already simple test

newren · gitster · commit 7db00f0b3bc2 · 2020-02-16T15:40:42.000-08:00
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 &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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' '

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,8 @@ test_expect_success 'setup' '`
`18`	`18`	`'`
`19`	`19`
`20`	`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`
`26`	`23`	`'`
`27`	`24`
`28`	`25`	`test_expect_success 'rebase against master twice' '`