From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org, sbeller@google.com,
computersforpeace@gmail.com, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v2] sequencer: require trailing NL in footers
Date: Tue, 25 Apr 2017 19:08:20 -0700 [thread overview]
Message-ID: <xmqqinlrudij.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170426000741.GS28740@aiede.svl.corp.google.com> (Jonathan Nieder's message of "Tue, 25 Apr 2017 17:07:41 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Jonathan Tan wrote:
>
>> Reported-by: Brian Norris <computersforpeace@gmail.com>
>> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
>> ---
> [...]
>> sequencer.c | 11 +++++++++++
>> t/t3511-cherry-pick-x.sh | 14 ++++++++++++++
>> 2 files changed, 25 insertions(+)
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
>
> This is still pretty subtle (using the added newline that is added after
> a non-footer to turn the invalid footer into a valid one), but
>
> * it is clear from the code that it will work correctly
> * the new test ensures we'll continue to support this case
> * it is understandable after a little head scratching
> * I'm hoping the subtlety will go away once the code learns to deal
> with ordinary non-footer text that has a missing newline
Hmph, perhaps we need another test that documents a known failure as
well in the meantime?
> [...]
>> --- a/t/t3511-cherry-pick-x.sh
>> +++ b/t/t3511-cherry-pick-x.sh
>> @@ -208,6 +208,20 @@ test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists fo
>> test_cmp expect actual
>> '
>>
>> +test_expect_success 'cherry-pick -x handles commits with no NL at end of message' '
>> + pristine_detach initial &&
>> + sha1=$(printf "title\n\nSigned-off-by: a" | git commit-tree -p initial mesg-with-footer^{tree}) &&
>
> nit: Should this use a more typical sign-off line with an email
> address, to avoid a false-positive success in case git becomes more
> strict about its signoffs in the future?
>
> Something like
>
> printf "title\n\nSigned-off-by: S. I. Gner <signer@example.com>" >msg &&
> sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
> ...
That is a good point and has an added benefit that the test script
becomes easier to follow.
t/t3511-cherry-pick-x.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh
index 6f518020b2..c2b143802d 100755
--- a/t/t3511-cherry-pick-x.sh
+++ b/t/t3511-cherry-pick-x.sh
@@ -210,12 +210,14 @@ test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists fo
test_expect_success 'cherry-pick -x handles commits with no NL at end of message' '
pristine_detach initial &&
- sha1=$(printf "title\n\nSigned-off-by: a" | git commit-tree -p initial mesg-with-footer^{tree}) &&
+ signer="S. I. Gner <signer@example.com>" &&
+ printf "title\n\nSigned-off-by: %s" "$signer" >msg &&
+ sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
git cherry-pick -x $sha1 &&
cat <<-EOF >expect &&
title
- Signed-off-by: a
+ Signed-off-by: $signer
(cherry picked from commit $sha1)
EOF
git log -1 --pretty=format:%B >actual &&
next prev parent reply other threads:[~2017-04-26 2:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 22:01 [GIT 2.12.2 REGRESSION] git cherry-pick -x Brian Norris
2017-04-21 22:10 ` Stefan Beller
2017-04-21 22:13 ` Jeff King
2017-04-25 19:06 ` [PATCH] sequencer: require trailing NL in footers Jonathan Tan
2017-04-25 21:04 ` Stefan Beller
2017-04-25 21:51 ` Jonathan Tan
2017-04-25 21:56 ` Stefan Beller
2017-04-25 22:05 ` Johannes Schindelin
2017-04-25 23:39 ` Jonathan Nieder
2017-04-25 22:30 ` Brian Norris
2017-04-26 20:31 ` Brian Norris
2017-04-25 21:56 ` Johannes Schindelin
2017-04-25 23:34 ` Jonathan Nieder
2017-04-25 23:57 ` [PATCH v2] " Jonathan Tan
2017-04-26 0:07 ` Jonathan Nieder
2017-04-26 2:08 ` Junio C Hamano [this message]
2017-04-26 9:09 ` Johannes Schindelin
2017-04-26 20:50 ` [PATCH v3] sequencer: add newline before adding footers Jonathan Tan
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=xmqqinlrudij.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=computersforpeace@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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).