t7407: make expectation as clear as possible

stefanbeller · gitster · commit 2ab56603bffb · 2016-03-30T13:09:57.000-07:00
Not everyone (including me) grasps the sed expression in a split second as
they would grasp the 4 lines printed as is.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
@@ -262,8 +262,12 @@ test_expect_success 'test "status --recursive"' '
 	test_cmp expect actual
 '
 
-sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2
-mv -f expect2 expect
+cat > expect <<EOF
+ $nested1sha1 nested1 (heads/master)
++$nested2sha1 nested1/nested2 (file2~1)
+ $nested3sha1 nested1/nested2/nested3 (heads/master)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+EOF
 
 test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
 	(

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,12 @@ test_expect_success 'test "status --recursive"' '`
`262`	`262`	`test_cmp expect actual`
`263`	`263`	`'`
`264`	`264`
`265`		`-sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2`
`266`		`-mv -f expect2 expect`
	`265`	`+cat > expect <<EOF`
	`266`	`+ $nested1sha1 nested1 (heads/master)`
	`267`	`++$nested2sha1 nested1/nested2 (file2~1)`
	`268`	`+ $nested3sha1 nested1/nested2/nested3 (heads/master)`
	`269`	`+ $submodulesha1 nested1/nested2/nested3/submodule (heads/master)`
	`270`	`+EOF`
`267`	`271`
`268`	`272`	`test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '`
`269`	`273`	`(`