From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 15:59:26 +0000 (+0100)
Subject: Split brain: Provide a lot more information to quiltify_splitbrain (nfc)
X-Git-Tag: archive/debian/2.0~306
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8414d99272d4bee82f3b8901dea2bab08aa7038b

Split brain: Provide a lot more information to quiltify_splitbrain (nfc)

It is going to need this extra info in a moment.
---

diff --git a/dgit b/dgit
index 1c52b635..d44f526d 100755
--- a/dgit
+++ b/dgit
@@ -2556,8 +2556,8 @@ sub quiltify_splitbrain_needed () {
     }
 }
 
-sub quiltify_splitbrain ($$) {
-    my ($clogp, $diffbits) = @_;
+sub quiltify_splitbrain ($$$$$) {
+    my ($clogp, $unapplied, $headref, $diffbits, $editedignores) = @_;
     if ($quilt_mode !~ m/gbp|dpm/) {
 	# treat .gitignore just like any other upstream file
 	$diffbits = { %$diffbits };
@@ -3056,11 +3056,12 @@ END
     # We calculate some guesswork now about what kind of tree this might
     # be.  This is mostly for error reporting.
 
+    my %editedignores;
     my $diffbits = {
         # H = user's HEAD
         # O = orig, without patches applied
         # A = "applied", ie orig with H's debian/patches applied
-        H2O => quiltify_trees_differ($headref,  $unapplied, 1),
+        H2O => quiltify_trees_differ($headref,  $unapplied, 1,\%editedignores),
         H2A => quiltify_trees_differ($headref,  $oldtiptree,1),
         O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
     };
@@ -3089,7 +3090,8 @@ END
         " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
 
     if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
-	quiltify_splitbrain($clogp, $diffbits);
+	quiltify_splitbrain($clogp, $unapplied, $headref,
+                            $diffbits, \%editedignores);
 	return;
     }