diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2012-03-12 23:54:05 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-13 14:26:27 -0700 |
| commit | fc5877a6231aca01b63ddfd507bc1180078c09e2 (patch) | |
| tree | 07f91ed01667f88d8f2d3948a70827995c73f678 /t/t4012-diff-binary.sh | |
| parent | fa678feb7ca12e306e2eaeb0078028505ab3318a (diff) | |
| download | git-fc5877a6231aca01b63ddfd507bc1180078c09e2.tar.gz | |
test: use test_i18ncmp when checking --stat output
Ever since v1.7.9.2~13 (2012-02-01), git's diffstat-style summary line
produced by "git apply --stat", "git diff --stat", and "git commit"
varies by locale, producing test failures when GETTEXT_POISON is set.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4012-diff-binary.sh')
| -rwxr-xr-x | t/t4012-diff-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 2d9f9a0cf1..008cf10a0c 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -25,11 +25,11 @@ cat > expected <<\EOF EOF test_expect_success 'diff without --binary' \ 'git diff | git apply --stat --summary >current && - test_cmp expected current' + test_i18ncmp expected current' test_expect_success 'diff with --binary' \ 'git diff --binary | git apply --stat --summary >current && - test_cmp expected current' + test_i18ncmp expected current' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch. |