From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 20 Jun 2018 23:32:34 +0000 (+0100)
Subject: dgit: quiltify_splitbrain: Pass $oldtiptree (o+d/p) too
X-Git-Tag: archive/debian/5.2~15
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=630bf678ac46457cb33f8f15ab4cdeed3c64ebe1

dgit: quiltify_splitbrain: Pass $oldtiptree (o+d/p) too

No functional change.

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

diff --git a/dgit b/dgit
index 1f065dd3..4535d8c3 100755
--- a/dgit
+++ b/dgit
@@ -5062,8 +5062,8 @@ sub quiltify_splitbrain_needed () {
     }
 }
 
-sub quiltify_splitbrain ($$$$$$) {
-    my ($clogp, $unapplied, $headref, $diffbits,
+sub quiltify_splitbrain ($$$$$$$) {
+    my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
 	$editedignores, $cachekey) = @_;
     if ($quilt_mode !~ m/gbp|dpm/) {
 	# treat .gitignore just like any other upstream file
@@ -5876,7 +5876,7 @@ END
         " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
 
     if (quiltmode_splitbrain()) {
-	quiltify_splitbrain($clogp, $unapplied, $headref,
+	quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
                             $diffbits, \%editedignores,
 			    $splitbrain_cachekey);
 	return;