Skip to content

Commit

Permalink
t3420: fix under GETTEXT_POISON build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gitster committed Jun 23, 2017
1 parent 7d70e6b commit adf16c0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t3420-rebase-autostash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" '
Expand Down Expand Up @@ -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
'
}

Expand Down

0 comments on commit adf16c0

Please sign in to comment.