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/t7602-merge-octopus-many.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/t7602-merge-octopus-many.sh')
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 5783ebf3ab..bce0bd37cb 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -66,7 +66,7 @@ EOF test_expect_success 'merge output uses pretty names' ' git reset --hard c1 && git merge c2 c3 c4 >actual && - test_cmp actual expected + test_i18ncmp expected actual ' cat >expected <<\EOF @@ -80,7 +80,7 @@ EOF test_expect_success 'merge up-to-date output uses pretty names' ' git merge c4 c5 >actual && - test_cmp actual expected + test_i18ncmp expected actual ' cat >expected <<\EOF @@ -97,7 +97,7 @@ EOF test_expect_success 'merge fast-forward output uses pretty names' ' git reset --hard c0 && git merge c1 c2 >actual && - test_cmp actual expected + test_i18ncmp expected actual ' test_done |