From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>
Subject: [PATCH] t7510: check %G* pretty-format output
Date: Mon, 16 Jun 2014 16:26:11 -0400 [thread overview]
Message-ID: <20140616202611.GA29716@sigill.intra.peff.net> (raw)
In-Reply-To: <20140616201311.GA26829@sigill.intra.peff.net>
On Mon, Jun 16, 2014 at 04:13:11PM -0400, Jeff King wrote:
> It doesn't look like we have any tests of "%G*" and friends at all. :(
Maybe we can add this:
-- >8 --
Subject: t7510: check %G* pretty-format output
We do not check these along with the other pretty-format
placeholders in t6006, because we need signed commits to
make them interesting. t7510 has such commits, and can
easily exercise them in addition to the regular
--show-signature code path.
Signed-off-by: Jeff King <peff@peff.net>
---
I explicitly avoided "%GG" here, as its exact format is dependent on
gpg (and the current date). I don't know that it is worth the
complexity to test, as the interesting parts are already parsed from it
and exposed in the other placeholders.
t/t7510-signed-commit.sh | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 5ddac1a..2f96937 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -76,6 +76,42 @@ test_expect_success GPG 'detect fudged signature' '
! grep "Good signature from" actual1
'
+test_expect_success GPG 'show good signature with custom format' '
+ cat >expect <<-\EOF
+ G
+ 13B6F51ECDDE430D
+ C O Mitter <committer@example.com>
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS" master >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPG 'show bad signature with custom format' '
+ cat >expect <<-\EOF
+ B
+ 13B6F51ECDDE430D
+ C O Mitter <committer@example.com>
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS" $(cat forged1.commit) >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPG 'show lack of signature with custom format' '
+ cat >expect <<-\EOF
+ N
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS" seventh-unsigned >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'unused %G placeholders are passed through' '
+ echo "%GX %G" >expect &&
+ git log -1 --format="%GX %G" >actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG 'detect fudged signature with NUL' '
git cat-file commit master >raw &&
cat raw >forged2 &&
--
2.0.0.566.gfe3e6b2
next prev parent reply other threads:[~2014-06-16 20:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 20:13 [PATCH] pretty: avoid reading past end-of-string with "%G" Jeff King
2014-06-16 20:26 ` Jeff King [this message]
2014-06-16 21:50 ` [PATCH] t7510: check %G* pretty-format output Eric Sunshine
2014-06-16 23:36 ` Jeff King
2014-06-16 23:59 ` [PATCH 0/5] --format=%G tests and fixes Jeff King
2014-06-16 23:59 ` [PATCH 1/5] t7510: stop referring to master in later tests Jeff King
2014-06-17 0:03 ` [PATCH 2/5] t7510: use consistent &&-chains in loop Jeff King
2014-06-17 0:05 ` [PATCH 3/5] t7510: test a commit signed by an unknown key Jeff King
2014-06-17 0:06 ` [PATCH 4/5] t7510: check %G* pretty-format output Jeff King
2014-06-17 0:07 ` [PATCH 5/5] pretty: avoid reading past end-of-string with "%G" Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140616202611.GA29716@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).