#1025155 git: with "cherry-pick -x", the "cherry picked from commit" line should be preceded by a blank line

Package:
git
Source:
git
Description:
fast, scalable, distributed revision control system
Submitter:
Vincent Lefevre
Date:
2022-12-02 04:27:06 UTC
Severity:
minor
#1025155#5
Date:
2022-11-30 12:22:02 UTC
From:
To:
When "git cherry-pick -x" is used, a "cherry picked from commit" line
is added to the commit message. A blank line is usually added, but not
always. A blank line should *always* be added.

Example in the mpfr repository:

commit e23fcc05837278a7bcac607c6c00b0949629e5f3
Author: Vincent Lefèvre <vincent@vinc17.net>
Date:   2022-11-30 13:05:59 +0100

    [doc/mpfr.texi] 2 replacements of ASCII "-" by @minus{}.

    Note: these should be the last remaining issues with the minus sign.

in master.

When I used "git cherry-pick -x e23fcc05837278a7bcac607c6c00b0949629e5f3"
in the 4.1 branch, I got:

commit 3a77d6e977ceb9c3bcf49252a18931a5f647f37a
Author: Vincent Lefevre <vincent@vinc17.net>
Date:   2022-11-30 13:05:59 +0100

    [doc/mpfr.texi] 2 replacements of ASCII "-" by @minus{}.

    Note: these should be the last remaining issues with the minus sign.
    (cherry picked from commit e23fcc05837278a7bcac607c6c00b0949629e5f3)

instead of

commit 3a77d6e977ceb9c3bcf49252a18931a5f647f37a
Author: Vincent Lefevre <vincent@vinc17.net>
Date:   2022-11-30 13:05:59 +0100

    [doc/mpfr.texi] 2 replacements of ASCII "-" by @minus{}.

    Note: these should be the last remaining issues with the minus sign.

    (cherry picked from commit e23fcc05837278a7bcac607c6c00b0949629e5f3)

I had to fix this manually with "git commit --amend".
#1025155#10
Date:
2022-12-02 04:22:10 UTC
From:
To:
Control: retitle -1 git cherry-pick -x: the "cherry picked from commit" line is not preceded by a blank line when the last line starts with "note:"
[...]

After various tests, it seems that the blank line is forgotten
when the last line of the commit message starts with "note:"
(case insensitively).

For instance:

    New commit

    foo

    nOtE:
    (cherry picked from commit 3ba643e2eec4bdc1cd46b478ab36ee0707d241c2)

and

    New commit

    Note: foo.
    (cherry picked from commit d0e85cdd32e30f78eeb968f275fc3a98899d791e)

but

    New commit

    note:
    foo

    (cherry picked from commit a0ffae22fd3c94210170a3addcf802804f6ee5f7)

----

    New commit

    A Note:

    (cherry picked from commit 0a89e0e7f8be3063803b0ad4381cd848ec52dd39)



----

    New commit

    Note

    (cherry picked from commit f217bd5069c9d66a8ca54c869919ff484a18d20c)