From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 11:22:03 +0000 (+0100)
Subject: Split brain: quiltify_trees_differ supports $ignoregitignore (nfc)
X-Git-Tag: archive/debian/2.0~326
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=40f9216be3a35fe378b6cdb5077fea52a3445bbd;hp=7fd3c5ea27a4713cbd9673fd63970e2e0123d332;p=dgit.git

Split brain: quiltify_trees_differ supports $ignoregitignore (nfc)

We are going to want to handle this specially.
---

diff --git a/dgit b/dgit
index 77f8819e..370986de 100755
--- a/dgit
+++ b/dgit
@@ -2510,14 +2510,15 @@ END
     }
 }
 
-sub quiltify_trees_differ ($$) {
-    my ($x,$y) = @_;
+sub quiltify_trees_differ ($$;$) {
+    my ($x,$y,$ignoregitignore) = @_;
     # returns 1 iff the two tree objects differ other than in debian/
     local $/=undef;
     my @cmd = (@git, qw(diff-tree --name-only -z), $x, $y);
     my $diffs= cmdoutput @cmd;
     foreach my $f (split /\0/, $diffs) {
 	next if $f eq 'debian';
+	next if $f eq '.gitignore' && $ignoregitignore;
 	return 1;
     }
     return 0;