diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-23 11:56:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-23 11:56:25 -0700 |
| commit | adf16c08cb966be9c03e6f5b5b7614f617f81b95 (patch) | |
| tree | e5b18c81917b6d2217dbf50ae5c41a2ab2fee43e | |
| parent | 7d70e6b9029cc033178a73ecedb3f447288b8384 (diff) | |
| download | git-adf16c08cb966be9c03e6f5b5b7614f617f81b95.tar.gz git-adf16c08cb966be9c03e6f5b5b7614f617f81b95.tar.xz | |
t3420: fix under GETTEXT_POISON build
Newly added tests to t3420 in this series prepare expected
human-readable output from "git rebase -i" and then compare the
actual output with it. As the output from the command is designed
to go through i18n/l10n, we need to use test_i18ncmp to tell
GETTEXT_POISON build that it is OK the output does not match.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 6826c38cb..e24370066 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -178,7 +178,7 @@ testrebase () { test_when_finished git branch -D rebased-feature-branch && suffix=${type#\ --} && suffix=${suffix:-am} && create_expected_success_$suffix && - test_cmp expected actual + test_i18ncmp expected actual ' test_expect_success "rebase$type: dirty index, non-conflicting rebase" ' @@ -275,7 +275,7 @@ testrebase () { test_when_finished git branch -D rebased-feature-branch && suffix=${type#\ --} && suffix=${suffix:-am} && create_expected_failure_$suffix && - test_cmp expected actual + test_i18ncmp expected actual ' } |