t5536: let 'test_i18ngrep' read the file without redirection

szeder · gitster · commit 93b4b0313c8d · 2018-02-08T10:54:27.000-08:00
Redirecting 'test_i18ngrep's standard input from a file will interfere
with the linting that will be added in a later patch.

Signed-off-by: SZEDER Gábor &lt;szeder.dev@gmail.com&gt;
Reviewed-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
@@ -22,7 +22,7 @@ verify_stderr () {
 	cat >expected &&
 	# We're not interested in the error
 	# "fatal: The remote end hung up unexpectedly":
-	test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
+	test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort &&
 	test_i18ncmp expected actual
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ verify_stderr () {`
`22`	`22`	`cat >expected &&`
`23`	`23`	`# We're not interested in the error`
`24`	`24`	`# "fatal: The remote end hung up unexpectedly":`
`25`		`- test_i18ngrep -E '^(fatal\|warning):' <error \| grep -v 'hung up' >actual \| sort &&`
	`25`	`+ test_i18ngrep -E '^(fatal\|warning):' error \| grep -v 'hung up' >actual \| sort &&`
`26`	`26`	`test_i18ncmp expected actual`
`27`	`27`	`}`
`28`	`28`