From d0e9a6a62239582302d4571393ebe18c3e4015e4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 3 Sep 2022 11:49:24 +0100 Subject: dgit: Rename quilt_fixup_dpkgsource_singlepatch and add comment Signed-off-by: Ian Jackson --- dgit | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index f7e13b1..9f1cb66 100755 --- a/dgit +++ b/dgit @@ -5950,7 +5950,12 @@ sub build_maybe_quilt_fixup () { "quilt mode %s does not make sense (or is not supported) with single-debian-patch", $quilt_mode if quiltmode_splitting(); - quilt_fixup_singlepatch($clogp, $headref, $upstreamversion); + + # We always use dpkg-source --commit in this case, because + # otherwise we can generate source packages that trigger horrible + # bugs in dpkg-source. + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018984 + quilt_fixup_dpkgsource_singlepatch($clogp, $headref, $upstreamversion); } else { quilt_fixup_multipatch($clogp, $headref, $upstreamversion, $splitbrain_cachekey); @@ -6027,7 +6032,7 @@ END ENDU } -sub quilt_fixup_singlepatch ($$$) { +sub quilt_fixup_dpkgsource_singlepatch ($$$) { my ($clogp, $headref, $upstreamversion) = @_; progress __ "starting quiltify (single-debian-patch)"; -- cgit v1.2.3