summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2012-04-13 23:46:18 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-14 16:17:08 -0700
commitb1f5b7839c3bce2accda8b70e03ccc62ad778dd9 (patch)
tree6346f481e6f124fdccfe5b4135404f33094c014d
parenttest: do not rely on US English tracking-info messages (diff)
downloadtgif-b1f5b7839c3bce2accda8b70e03ccc62ad778dd9.tar.xz
test: use test_i18ncmp for "Patch format detection failed" message
v1.7.8.5~2 (am: don't infloop for an empty input file, 2012-02-25) added a check for the human-readable message "Patch format detection failed." but we forgot to suppress that check when running tests with git configured to write output in another language. Noticed by running tests with GETTEXT_POISON=YesPlease. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4150-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index ccc0280f52..ebb4a26a0d 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -527,7 +527,7 @@ test_expect_success 'am empty-file does not infloop' '
test_tick &&
{ git am empty-file > actual 2>&1 && false || :; } &&
echo Patch format detection failed. >expected &&
- test_cmp expected actual
+ test_i18ncmp expected actual
'
test_done