Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 885923610ab927c418c848fb706f621b5380d16b..d4b217b0ee5136d2836ba9526b286659d66afe80 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -257,7 +257,7 @@ test_expect_success 'checkout to detach HEAD' '
        git checkout -f renamer && git clean -f &&
        git checkout renamer^ 2>messages &&
        test_i18ngrep "HEAD is now at 7329388" messages &&
-       test_line_count -gt 1 messages &&
+       (test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        test "z$H" = "z$M" &&