diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2012-03-13 04:54:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-13 21:26:27 (GMT) |
| commit | fc5877a6231aca01b63ddfd507bc1180078c09e2 (patch) | |
| tree | 07f91ed01667f88d8f2d3948a70827995c73f678 /t/t3300-funny-names.sh | |
| parent | fa678feb7ca12e306e2eaeb0078028505ab3318a (diff) | |
| download | git-fc5877a6231aca01b63ddfd507bc1180078c09e2.zip git-fc5877a6231aca01b63ddfd507bc1180078c09e2.tar.gz git-fc5877a6231aca01b63ddfd507bc1180078c09e2.tar.bz2 | |
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/t3300-funny-names.sh')
| -rwxr-xr-x | t/t3300-funny-names.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh index 9f00ada..644aa21 100755 --- a/t/t3300-funny-names.sh +++ b/t/t3300-funny-names.sh @@ -174,7 +174,7 @@ EOF test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \ 'git diff-index -M -p $t0 | git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current && - test_cmp expected current' + test_i18ncmp expected current' test_expect_success TABS_IN_FILENAMES 'setup expect' ' cat > expected <<\EOF @@ -187,12 +187,12 @@ EOF test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \ 'git diff-index -p $t0 | git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current && - test_cmp expected current' + test_i18ncmp expected current' test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \ 'git diff-index -p $t0 | sed -ne "/^[-+@]/p" | git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current && - test_cmp expected current' + test_i18ncmp expected current' test_done |