Junio C Hamano <gits...@pobox.com> writes:
> Thanks. t6300 seems to show that %(contents:trailers:unfold) does
> not quite work, among other things.
>
> https://travis-ci.org/git/git/jobs/282126607#L3658
>
> I didn't have a chance to look into it myself.
Peff's "oops, your logic is backwards" fixes the above failure.
We also need this on top to pass the gettext-poison build.
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 872973b954..3bdfa02559 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -685,19 +685,21 @@ test_expect_success '%(contents:trailers:only) and
%(contents:trailers:unfold) w
'
test_expect_success '%(trailers) rejects unknown trailers arguments' '
+ # error message cannot be checked under i18n
cat >expect <<-EOF &&
fatal: unknown %(trailers) argument: unsupported
EOF
test_must_fail git for-each-ref --format="%(trailers:unsupported)"
2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
+ # error message cannot be checked under i18n
cat >expect <<-EOF &&
fatal: unknown %(trailers) argument: unsupported
EOF
test_must_fail git for-each-ref
--format="%(contents:trailers:unsupported)" 2>actual &&
- test_cmp expect actual
+ test_i18ncmp expect actual
'
test_expect_success 'basic atom: head contents:trailers' '
