Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5536: let 'test_i18ngrep' read the file without redirection
author
SZEDER Gábor
<szeder.dev@gmail.com>
Thu, 8 Feb 2018 15:56:53 +0000
(16:56 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 8 Feb 2018 18:54:27 +0000
(10:54 -0800)
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>
t/t5536-fetch-conflicts.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
927c1a6
)
diff --git
a/t/t5536-fetch-conflicts.sh
b/t/t5536-fetch-conflicts.sh
index 2e42cf331648a8ba57b3806443e70b94b09eb382..644736b8a3b95c501bd8bb99850dd8de474b10d6 100755
(executable)
--- 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
}