From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Sep 2016 17:35:00 +0000 (+0100)
Subject: Do not fail to do some important quilt processing in some --quilt modes.
X-Git-Tag: archive/debian/2.0~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=996489fe48ebd57d4ad5f4a8bff7e2a871dc0a87

Do not fail to do some important quilt processing in some --quilt modes.

Make `madformat' mean precisely `is 3.0 (quilt)' and change the two
call sites which wanted to check the quilt mode too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index c493eddf..5ecee038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ dgit (1.5~~) unstable; urgency=medium
   * When synthesing a commit from a .dsc from the archive, stop
     internal git reset from printing a confusing message about HEAD.
   * Turn off git gc in the private working areas.
+  * Do not fail to do some important quilt processing in some
+    --quilt modes.
   * Fix a couple of bugs in error reporting.
 
   Test suite:
diff --git a/dgit b/dgit
index 0cf854d3..d8ab871a 100755
--- a/dgit
+++ b/dgit
@@ -150,6 +150,8 @@ sub debiantag_maintview ($$) {
     return "$distro/$v";
 }
 
+sub madformat ($) { $_[0] eq '3.0 (quilt)' }
+
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
 sub lref () { return "refs/heads/".lbranch(); }
@@ -2346,7 +2348,7 @@ sub get_source_format () {
     return ($_, \%options);
 }
 
-sub madformat ($) {
+sub madformat_wantfixup ($) {
     my ($format) = @_;
     return 0 unless $format eq '3.0 (quilt)';
     our $quilt_mode_warned;
@@ -2750,7 +2752,7 @@ END
     my $dgithead = $actualhead;
     my $maintviewhead = undef;
 
-    if (madformat($format)) {
+    if (madformat_wantfixup($format)) {
 	# user might have not used dgit build, so maybe do this now:
 	if (quiltmode_splitbrain()) {
 	    my $upstreamversion = $clogp->{Version};
@@ -3691,7 +3693,7 @@ sub quiltify ($$$$) {
 
 sub build_maybe_quilt_fixup () {
     my ($format,$fopts) = get_source_format;
-    return unless madformat $format;
+    return unless madformat_wantfixup $format;
     # sigh
 
     check_for_vendor_patches();