Re: [PATCH] commit -s: allow "(cherry picked " lines in sign-off section

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 16, 2010, 22:52 UTC
Message-ID: <7vlj4shoej.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101116204027.GB27390@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

Show 31 quoted lines

> Jonathan Nieder wrote:
>
>> 	(cherry picked from commit 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0)
>> 
>> 	Signed-off-by: Back Porter <backporter@example.com>
>> 
>> The cherry-pick is a step in the line of a patch like any other,
>> so one might prefer to lose the extra newline.
>
> Sigh.  s/line/life/
>
> [...]
>> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
>
> Let's kick off the reviews.
>
>> --- a/builtin/commit.c
>> +++ b/builtin/commit.c
>> @@ -528,6 +528,8 @@ static int ends_rfc2822_footer(struct strbuf *sb)
>>  		i++;
>>  
>>  	for (; i < len; i = k) {
>> +		static const char cherry_pick[] = "(cherry picked from commit ";
>> +
>
> Better to share this string with builtin/revert.c, no?
>
> What would happen when "(cherry picked ..." gets translated?
> Should only the current language's version be tolerated in
> the commit footer, or is there something more generic to
> match for that could take care of wording changes automatically?

With this patch you are declaring that "(cherry picked from..." is a magic marker just like "Signed-off-by: " never to be translated, no?

I am not sure I agree with the reasoning of this patch, by the way. A cherry-pick is an event that breaks the life of the patch, so it may even be a sensible thing to do to express "the above sign-off chain shows who were involved in the original commit; I am cherry-picking it out of context, and these people do not have much to do with the result" with a blank line on both sides of the "cherry picked" line, like this:

        A concise summary of the change

	A detailed description of the change, why it is needed, what
        was broken and why applying this is the best course of action.

	Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
	Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

	(cherry picked from commit 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0)

	Signed-off-by: Back Porter <backporter@example.com>