Package: git-buildpackage Version: 0.9.39 Severity: wishlist X-Debbugs-Cc: Richard Hansen <[email protected]>
Dear Maintainer,
0.9.39 changes `gbp pq export` behavior to use `git diff -C` output in
d/p/**.patch [0].
* [05a71f0] pq: Create rename and copy patches when exporting.
This produces smaller patches that are easier to review and easier to
refresh by devs that don't use git-buildpackage. […]
(Closes: #1100809)
When backporting security patches to older suites it IMHO produces
patches that are actually *harder* to review. For instance an upstream
change might introduce a new unit test file, which `gbp pq export`
generates as “copy from other/unit/test” for the debian/trixie branch,
and as “copy from other/unit/test2-different-source” for the
debian/bookworm branch. Although the new files from the two branches
are identical, the exported patches are completely different and
diff'ing the two to produces confusing output.
I often double-check my backports using `git diff
debian/bookworm..debian/trixie debian/patches/CVE-YYYY-XXXX.patch`,
and find that forced copy detection makes the output uncheckable. See
for instance
https://salsa.debian.org/lts-team/packages/gnutls28/-/blob/debian/bullseye/debian/patches/CVE-2025-9820/01-aa5f15a872.patch?ref_type=heads#L530
vs
https://salsa.debian.org/lts-team/packages/gnutls28/-/blob/debian/buster/debian/patches/CVE-2025-9820/01-aa5f15a872.patch?ref_type=heads#L530
I think copy detection is not desirable in all workflows and wish it
could be disabled from gbp.conf, but unfortunately it's not
configurable.
Thanks for maintaining git-buildpackage!
--
Guilhem.
[0]
https://salsa.debian.org/agx/git-buildpackage/-/commit/05a71f06aa46c0dbc58eec9904ab9746545444dd
-- System Information:
Debian Release: forky/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.18.5+deb14-amd64 (SMP w/8 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages git-buildpackage depends on:
ii devscripts 2.26.7
ii git 1:2.53.0-1
ii man-db 2.13.1-1
ii python3 3.13.9-3
ii python3-dateutil 2.9.0-4
ii python3-yaml 6.0.3-1
ii sensible-utils 0.0.26
Versions of packages git-buildpackage recommends:
ii pristine-tar 1.50+nmu2
ii python3-requests 2.32.5+dfsg-1
ii sbuild 0.91.7
Versions of packages git-buildpackage suggests:
pn python3-notify2 <none>
ii sudo 1.9.17p2-5
ii unzip 6.0-29
-- no debconf information
signature.asc
Description: PGP signature
