Package: git
Version: 1:2.38.1-1
Severity: minor

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 <vinc...@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 <vinc...@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 <vinc...@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".

-- System Information:
Debian Release: bookworm/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'stable-updates'), (500, 
'stable-security'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 
'experimental')
merged-usr: no
Architecture: amd64 (x86_64)

Kernel: Linux 6.0.0-5-amd64 (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=POSIX, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages git depends on:
ii  git-man          1:2.38.1-1
ii  libc6            2.36-5
ii  libcurl3-gnutls  7.86.0-2
ii  liberror-perl    0.17029-2
ii  libexpat1        2.5.0-1
ii  libpcre2-8-0     10.40-2
ii  perl             5.36.0-4
ii  zlib1g           1:1.2.13.dfsg-1

Versions of packages git recommends:
ii  ca-certificates              20211016
ii  less                         590-1+local1
ii  openssh-client [ssh-client]  1:9.1p1-1
ii  patch                        2.7.6-7

Versions of packages git suggests:
ii  gettext-base                          0.21-10
pn  git-cvs                               <none>
pn  git-daemon-run | git-daemon-sysvinit  <none>
ii  git-doc                               1:2.38.1-1
ii  git-email                             1:2.38.1-1
ii  git-gui                               1:2.38.1-1
pn  git-mediawiki                         <none>
pn  git-svn                               <none>
ii  gitk                                  1:2.38.1-1
pn  gitweb                                <none>

-- no debconf information

-- 
Vincent Lefèvre <vinc...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Reply via email to