diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2018-02-08 16:56:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-08 10:54:27 -0800 |
| commit | 93b4b0313c8d9d3600fc27b7023dab0d9d9be739 (patch) | |
| tree | 5db1e52de98b2497ea18ba5cd3c15f8119c2c1ec | |
| parent | t5510: consolidate 'grep' and 'test_i18ngrep' patterns (diff) | |
| download | tgif-93b4b0313c8d9d3600fc27b7023dab0d9d9be739.tar.xz | |
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>
| -rwxr-xr-x | t/t5536-fetch-conflicts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |