From: Junio C Hamano <gitster@pobox.com>
To: Brandon Casey <drafnel@gmail.com>
Cc: git@vger.kernel.org, Brandon Casey <bcasey@nvidia.com>
Subject: Re: [PATCH 2/5] t/t3511: demonstrate breakage in cherry-pick -s
Date: Thu, 15 Nov 2012 17:58:39 -0800 [thread overview]
Message-ID: <7v8va28g1c.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1352943474-15573-2-git-send-email-drafnel@gmail.com> (Brandon Casey's message of "Wed, 14 Nov 2012 17:37:51 -0800")
Brandon Casey <drafnel@gmail.com> writes:
> The cherry-pick -s functionality is currently broken in two ways.
>
> 1. handling of rfc2822 continuation lines has a bug, and the
> continuation lines are not handled correctly.
This is not limited to you, but people should think twice when
writing "has a bug" and "are not handled correctly" in their log
message. Did you write what the expected and actual behaviours?
> +rfc2822_mesg="$non_rfc2822_mesg
> +
> +Signed-off-by: A.U. Thor
> + <author@example.com>
> +Signed-off-by: B.U. Thor <buthor@example.com>"
The S-o-b: lines are meant to record people's contact info in human
readable forms, and folding the lines like the above makes it a lot
harder to read. They typically do not have to be folded.
Besides, the footer lines are *not* RFC2822 headers (and are not
used as such when send-email comes up with Cc: list) in the first
place; have we ever said anything about supporting the RFC2822 line
folding in the commit footer? If not (and I am reasonably sure we
never have), I personally think we should actively *discourage* line
folding there.
> i.e. we should produce this:
>
> Signed-off-by: A.U. Thor <author@example.com>
> (cherry picked from )
> Signed-off-by: C O Mmitter <committer@example.com>
>
> not
>
> Signed-off-by: A.U. Thor <author@example.com>
> (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709)
>
> Signed-off-by: C O Mmitter <committer@example.com>
I can buy that, but then this makes it very clear that these footer
lines are not shaped like RFC2822 headers, no?
Thanks.
next prev parent reply other threads:[~2012-11-16 1:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 1:37 [PATCH 1/5] t/test-lib-functions.sh: allow to specify the tag name to test_commit Brandon Casey
2012-11-15 1:37 ` [PATCH 2/5] t/t3511: demonstrate breakage in cherry-pick -s Brandon Casey
2012-11-16 1:58 ` Junio C Hamano [this message]
2012-11-16 2:40 ` Brandon Casey
2012-11-15 1:37 ` [PATCH 3/5] sequencer.c: handle rfc2822 continuation lines correctly Brandon Casey
2012-11-15 1:37 ` [PATCH 4/5] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer Brandon Casey
2012-11-15 17:55 ` [PATCH v2 " Brandon Casey
2012-11-15 1:37 ` [PATCH/RFC 5/5] sequencer.c: always separate "(cherry picked from" from commit body Brandon Casey
2012-11-15 23:24 ` [PATCH 6/5] sequencer.c: refrain from adding duplicate s-o-b lines Brandon Casey
2012-11-16 2:03 ` Junio C Hamano
2012-11-16 23:55 ` Brandon Casey
2012-11-15 3:20 ` [PATCH 1/5] t/test-lib-functions.sh: allow to specify the tag name to test_commit Matt Kraai
2012-11-15 5:43 ` Brandon Casey
2012-11-15 5:49 ` [PATCH 1/5 v2] " Brandon Casey
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=7v8va28g1c.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bcasey@nvidia.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
/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).