On 2012-02-19 09:44, Junio C Hamano wrote:
> Beat Bolli <bbolli@xxxxxxxxx> writes:
>
>> When cherry-picking a commit that has only a summary, the -x option
>> creates an invalid commit message because it puts the hash of the commit
>> being picked on the second line which should be left empty.
>>
>> This patch fixes this buglet by always inserting an empty line before
>> the added line.
>>
>> Aside from that, even with a non-trivial commit the generated note
>> "(cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)"
>> seems abrupt when appended directly.
>>
>> Cc: Eric Raible <raible@xxxxxxxxxxx>
>> Signed-off-by: Beat Bolli <bbolli@xxxxxxxxx>
>> ---
>> sequencer.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/sequencer.c b/sequencer.c
>> index 5fcbcb8..63fd589 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -382,7 +382,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
>> }
>>
>> if (opts->record_origin) {
>> - strbuf_addstr(&msgbuf, "(cherry picked from commit ");
>> + strbuf_addstr(&msgbuf, "\n(cherry picked from commit ");
>
> Doesn't this need to be conditional?
>
> If we cherry pick your commit somewhere else with "-x -s", the resulting
> commit log message would end like this:
>
> Aside from that, even with a non-trivial commit the generated note
> "(cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)"
> seems abrupt when appended directly.
>
> Cc: Eric Raible <raible@xxxxxxxxxxx>
> Signed-off-by: Beat Bolli <bbolli@xxxxxxxxx>
>
> (cherry picked from commit 555c9864971744abb558796aea28e12a1ac20839)
> Signed-off-by: Frotz Xyzzy <nitfol@xxxxxxxxxx>
>
> which clearly is worse-looking with the extra LF you added in this patch.
What should the condition then be? What is the canonical format for
cherry-picks with Signed-off-by: and Cc: footer lines?
>
>> strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
>> strbuf_addstr(&msgbuf, ")\n");
>> }
--
mail: echo '<bNbolOli@xxxxxxxxxxxxx>' | tr -d '[A-S]'
pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A
gsm: 4.7.7.6.0.7.7.9.7.1.4.e164.arpa
icbm: 47.0452 N, 7.2715 E
http: www.drbeat.li
"It takes love over gold, and mind over matter" -- Dire Straits
Attachment:
signature.asc
Description: OpenPGP digital signature