Merge branch 'mg/status-porcelain-no-i18n' into maint

diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 07079a41c4f6b9f89786d7eb9187655102ed9bd0..d62ccbb98e6148fa2677bbb763c17b3321168635 100755 (executable)
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -125,4 +125,20 @@ test_expect_success GPG 'verify multiple tags' '
        test_cmp expect.stderr actual.stderr
 '
 
+test_expect_success 'verifying tag with --format' '
+       cat >expect <<-\EOF
+       tagname : fourth-signed
+       EOF &&
+       git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
+       cat >expect <<-\EOF
+       tagname : 7th forged-signed
+       EOF &&
+       test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
+       test_cmp expect actual-forged
+'
+
 test_done