diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2012-03-13 08:54:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-14 01:26:27 +0400 |
| commit | fc5877a6231aca01b63ddfd507bc1180078c09e2 (patch) | |
| tree | 07f91ed01667f88d8f2d3948a70827995c73f678 /t/t4100-apply-stat.sh | |
| parent | fa678feb7ca12e306e2eaeb0078028505ab3318a (diff) | |
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/t4100-apply-stat.sh')
| -rwxr-xr-x | t/t4100-apply-stat.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh index 9b433de836..744b8e51be 100755 --- a/t/t4100-apply-stat.sh +++ b/t/t4100-apply-stat.sh @@ -17,13 +17,13 @@ do test_expect_success "$title" ' git apply --stat --summary \ <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current && - test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current + test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current ' test_expect_success "$title with recount" ' sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" | git apply --recount --stat --summary >current && - test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current + test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current ' done <<\EOF rename |