[PATCH 2/2] t5556: replace test_i18ngrep with a simple grep
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- Feb 12, 2018, 00:18 UTC
- Message-ID
- <d0e6c6cf-7166-bef6-f179-c4e6acf7b0ac@ramsayjones.plus.com>
Attempting to grep the output of test_i18ngrep will not work under a poison build, since the output is (almost) guaranteed not to have the string you are looking for. In this case, the output of test_i18ngrep is further filtered by a simple piplined grep to exclude an '... remote end hung up unexpectedly' warning message. Use a regular 'grep -E' to replace the call to test_i18ngrep in the filter pipeline.
Also, remove a useless invocation of 'sort' as the final element of the pipeline.
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> --- 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..38381df5e 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 && + grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual && test_i18ncmp expected actual }
-- 2.16.0