From: SZEDER Gábor Date: Fri, 26 Jan 2018 12:37:04 GMT Subject: [PATCH 06/10] t5536: let 'test_i18ngrep' read the file without redirection Message-ID: <20180126123708.21722-7-szeder.dev@gmail.com> In-Reply-To: <20180126123708.21722-1-szeder.dev@gmail.com> 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 --- t/t5536-fetch-conflicts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh index 2e42cf331..644736b8a 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):' actual | sort && + test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort && test_i18ncmp expected actual } -- 2.16.1.155.g5159265b1