t6050: redirect expected error output to a file

chriscool · gitster · commit 587617016744 · 2019-04-01T17:49:00.000+09:00
Otherwise the error from `git rev-parse` is uselessly
polluting the debug output.

Redirecting to a file, instead of /dev/null, makes it
possible to check that we got the error we expected, so
let's check that too.

Reviewed-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Helped-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Helped-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
@@ -40,7 +40,8 @@ commit_peeling_shows_parents ()
 	test "$_found" = "$_parent" || return 1
 	_parent_number=$(( $_parent_number + 1 ))
     done &&
-    test_must_fail git rev-parse --verify $_commit^$_parent_number
+    test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&
+    test_i18ngrep "Needed a single revision" err
 }
 
 commit_has_parents ()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ commit_peeling_shows_parents ()`
`40`	`40`	`test "$_found" = "$_parent" \|\| return 1`
`41`	`41`	`_parent_number=$(( $_parent_number + 1 ))`
`42`	`42`	`done &&`
`43`		`- test_must_fail git rev-parse --verify $_commit^$_parent_number`
	`43`	`+ test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&`
	`44`	`+ test_i18ngrep "Needed a single revision" err`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`commit_has_parents ()`