From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu, 8 Feb 2018 15:56:53 +0000 (+0100)
Subject: t5536: let 'test_i18ngrep' read the file without redirection
X-Git-Tag: v2.16.3~24^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/93b4b0313c8d9d3600fc27b7023dab0d9d9be739?hp=--cc

t5536: let 'test_i18ngrep' read the file without redirection

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 <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

93b4b0313c8d9d3600fc27b7023dab0d9d9be739
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 2e42cf3316..644736b8a3 100755
--- 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
 }