t6300: unify %(trailers) and %(contents:trailers) tests

Currently, there are different tests for testing %(trailers) and
%(contents:trailers) causing redundant copy.

Its time to get rid of duplicate code.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Heba Waly <heba.waly@gmail.com>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index da59fadc5d8f915cbb60cd426c58becb04e7c42a..5ee08cf514db8bced0188f8823bc8ff75ed5c69d 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -738,61 +738,40 @@ test_expect_success 'set up trailers for next test' '
 '
 
 test_expect_success '%(trailers:unfold) unfolds trailers' '
-       git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
        {
                unfold <trailers
                echo
        } >expect &&
+       git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
+       test_cmp expect actual &&
+       git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
        test_cmp expect actual
 '
 
 test_expect_success '%(trailers:only) shows only "key: value" trailers' '
-       git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
        {
                grep -v patch.description <trailers &&
                echo
        } >expect &&
+       git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
+       test_cmp expect actual &&
+       git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
        test_cmp expect actual
 '
 
 test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
-       git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
-       git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
-       test_cmp actual reverse &&
        {
                grep -v patch.description <trailers | unfold &&
                echo
        } >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
-       git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
-       {
-               unfold <trailers
-               echo
-       } >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' '
-       git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
-       {
-               grep -v patch.description <trailers &&
-               echo
-       } >expect &&
-       test_cmp expect actual
-'
-
-test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
+       git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
+       test_cmp expect actual &&
+       git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >actual &&
+       test_cmp actual actual &&
        git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
-       git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
-       test_cmp actual reverse &&
-       {
-               grep -v patch.description <trailers | unfold &&
-               echo
-       } >expect &&
-       test_cmp expect actual
+       test_cmp expect actual &&
+       git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >actual &&
+       test_cmp actual actual
 '
 
 test_expect_success '%(trailers) rejects unknown trailers arguments' '
@@ -801,14 +780,7 @@ test_expect_success '%(trailers) rejects unknown trailers arguments' '
        fatal: unknown %(trailers) argument: unsupported
        EOF
        test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>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_i18ncmp expect actual &&
        test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
        test_i18ncmp expect actual
 '