X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=370986de49a919f60c26e37cedb821edd674148b;hb=40f9216be3a35fe378b6cdb5077fea52a3445bbd;hp=77f8819ef8858307c636aafbfdd9e956053d1d94;hpb=7fd3c5ea27a4713cbd9673fd63970e2e0123d332;p=dgit.git

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;