From: Santiago Torres <santiago@nyu.edu>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Jan Palus <jan.palus@gmail.com>
Subject: Re: [PATCH 3/3] t7004, t7030: fix here-doc syntax errors
Date: Wed, 22 Mar 2017 18:51:08 -0400 [thread overview]
Message-ID: <20170322225108.wub4bmr63hk2sp33@LykOS.localdomain> (raw)
In-Reply-To: <20170322224124.u3eax4ui3y4saxks@sigill.intra.peff.net>
[-- Attachment #1: Type: text/plain, Size: 3421 bytes --]
On Wed, Mar 22, 2017 at 06:41:24PM -0400, Jeff King wrote:
> > In that case, something like this would be closer to the desired
> > behavior?
>
> Yes, though you can spell:
>
> cat >expect <<-\EOF
> EOF
>
> as just:
>
> >expect
Ah, that sounds like a better way to fix this with a smaller diff.
>
> > I'm also unsure on what would be the right thing to put on the commit
> > message.
>
> I think the argument is:
>
> 1. It's safer not to expound on tags that have failed verification (so
> that the caller cannot accidentally use them). Especially since the
> --format cannot tell anything about the GPG status.
>
> That means that
>
> tag=$(git verify-tag --format='%(tag)' foo)
>
> can use a non-blank $tag without having to wonder whether it is
> valid or not.
>
> and
>
> 2. That's what we've done since the feature was released.
>
> The only thing that would give me pause is if were to later add
> %G-like formatters, and then:
>
> xargs git verify-tag --format='%(gpg:status) %(tag)' |
> while read status tag
> do
> ...
> done
>
> would become useful, but we'd be tied to the behavior that we omit the
> tag when the gpg verification failed (for backwards compatibility).
> OTOH, we could perhaps make the rule "ignored unless %(gpg) formatters
> are used". Which would be backwards-compatible and safe for old formats,
> and work correctly for new ones.
This sounds like a helpful addition to implement. We could update/add
tests for compliance on this once the feature is addded and fix the
ambiguous behavior in the tests now.
Thanks,
-Santiago.
---
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index b4698ab5f..0581053a0 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -896,17 +896,15 @@ test_expect_success GPG 'verifying a forged tag should fail' '
'
test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : signed-tag
- EOF &&
+ EOF
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
test_cmp expect actual
'
-test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
- cat >expect <<-\EOF
- tagname : forged-tag
- EOF &&
+test_expect_success 'verifying a forged tag with --format should fail silently' '
+ >expect &&
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
test_cmp expect actual
'
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index d62ccbb98..173a88e89 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -126,17 +126,15 @@ test_expect_success GPG 'verify multiple tags' '
'
test_expect_success 'verifying tag with --format' '
- cat >expect <<-\EOF
+ cat >expect <<-\EOF &&
tagname : fourth-signed
- EOF &&
+ 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_expect_success 'verifying a forged tag with --format should fail silently' '
+ >expect &&
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
test_cmp expect actual-forged
'
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-03-22 22:51 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 17:35 EOF test fixes (t5615/t7004) Jan Palus
2017-03-22 18:28 ` EOF test fixes (t7030/t7406) Jan Palus
2017-03-22 18:47 ` EOF test fixes (t5615/t7004) Stefan Beller
2017-03-22 19:43 ` Junio C Hamano
2017-03-22 20:08 ` [PATCH 0/3] fix "here-doc" syntax errors Junio C Hamano
2017-03-22 20:08 ` [PATCH 1/3] t5615: fix a here-doc syntax error Junio C Hamano
2017-03-22 21:02 ` Jeff King
2017-03-22 20:08 ` [PATCH 2/3] t7406: fix here-doc syntax errors Junio C Hamano
2017-03-22 21:07 ` Jeff King
2017-03-22 21:32 ` Stefan Beller
2017-03-22 21:39 ` Jeff King
2017-03-22 21:49 ` [PATCH] t7406: correct test case for submodule-update initial population Stefan Beller
2017-03-22 21:59 ` Jeff King
2017-03-22 22:07 ` Stefan Beller
2017-03-22 22:09 ` Jeff King
2017-03-22 22:14 ` Jonathan Nieder
2017-03-22 22:12 ` Junio C Hamano
2017-03-22 22:24 ` Jeff King
2017-03-22 22:28 ` Stefan Beller
2017-03-22 21:34 ` [PATCH 2/3] t7406: fix here-doc syntax errors Junio C Hamano
2017-03-22 20:08 ` [PATCH 3/3] t7004, t7030: " Junio C Hamano
2017-03-22 21:10 ` Jeff King
2017-03-22 21:43 ` Santiago Torres
2017-03-22 22:04 ` Jeff King
2017-03-22 22:04 ` Junio C Hamano
2017-03-22 22:15 ` Santiago Torres
2017-03-22 22:22 ` Jeff King
2017-03-22 22:34 ` Santiago Torres
2017-03-22 22:41 ` Jeff King
2017-03-22 22:47 ` Junio C Hamano
2017-03-22 22:51 ` Santiago Torres [this message]
2017-03-23 22:00 ` Junio C Hamano
2017-03-23 22:28 ` Santiago Torres
2017-03-23 23:49 ` Jeff King
2017-03-24 16:45 ` Junio C Hamano
2017-03-24 16:49 ` Jeff King
2017-03-24 18:00 ` Jeff King
2017-03-24 18:04 ` Junio C Hamano
2017-03-24 18:16 ` Jeff King
2017-03-22 22:38 ` Junio C Hamano
2017-03-22 22:40 ` [PATCH 0/3] fix "here-doc" " Jan Palus
2017-03-23 2:12 ` [PATCH] tests: lint for run-away here-doc Junio C Hamano
2017-03-23 5:43 ` [PATCH v2] " Junio C Hamano
2017-03-24 1:29 ` Jonathan Nieder
2017-03-24 2:45 ` Junio C Hamano
2017-03-24 3:59 ` 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=20170322225108.wub4bmr63hk2sp33@LykOS.localdomain \
--to=santiago@nyu.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jan.palus@gmail.com \
--cc=peff@peff.net \
/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).