Junio C Hamano <gitster@xxxxxxxxx> writes: >> git-rebase.sh | 4 +- >> sequencer.c | 11 ++-- >> t/t3404-rebase-interactive.sh | 7 +++ >> t/t3420-rebase-autostash.sh | 136 ++++++++++++++++++++++++++++++++++++++++-- >> 4 files changed, 147 insertions(+), 11 deletions(-) > > I've merged this to 'next' but I probably shouldn't have before > making sure that Travis tests passes 'pu' while this was still in > there. > > At least t3420 seems to fail under GETTEXT_POISON build. > > https://travis-ci.org/git/git/jobs/245990993 This should be sufficient to make t3420 pass. It seems that t3404 is also broken under GETTEXT_POISON build, but I won't have time to look at it, at least tonight. $ make GETTEXT_POISON=YesPlease $ cd t && sh ./t3404-*.sh -i -v to see how it breaks. Thanks. t/t3420-rebase-autostash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 6826c38cbd..e243700660 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 ' }
