These patches resulted from an experiment of yours [1], I wrote these up
last year, then promptly forgot about them! ;-)
These patches were built on top of v2.16, and the second patch has a simple
conflict with commit 93b4b0313c ("t5536: let 'test_i18ngrep' read the file
without redirection", 2018-02-08), which is in the 'next' branch.
The conflict looks like so:
$ git diff
diff --cc t/t5536-fetch-conflicts.sh
index 644736b8a,38381df5e..000000000
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@@ -22,7 -22,7 +22,11 @@@ verify_stderr ()
cat >expected &&
# We're not interested in the error
# "fatal: The remote end hung up unexpectedly":
++<<<<<<< HEAD
+ test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort &&
++=======
+ grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual &&
++>>>>>>> master-i18n
test_i18ncmp expected actual
}
$
The resolution is to simply take the 'master-i18n' text. However, if you
prefer, I can rebuild these patches on top of 'next' and re-submit. Just
let me know.
Note that I replaced an 'test_i18ngrep -E' with 'grep -E' rather than egrep.
(the grep man page claims that egrep, fgrep and rgrep are deprecated, but I
think that has been the case for as long as I can remember, so don't hold
your breath!).
[1] https://public-inbox.org/git/%3Cxmqqvahawirr.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxx%3E/
Ramsay Jones (2):
t4151: consolidate multiple calls to test_i18ngrep
t5556: replace test_i18ngrep with a simple grep
t/t4151-am-abort.sh | 5 ++---
t/t5536-fetch-conflicts.sh | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
--
2.16.0
