diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-06-04 12:22:03 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:47 +0100 |
commit | 40f9216be3a35fe378b6cdb5077fea52a3445bbd (patch) | |
tree | 305e68cdf65e7b8c9b4bf84bf27e136d558fb689 /dgit | |
parent | 7fd3c5ea27a4713cbd9673fd63970e2e0123d332 (diff) |
Split brain: quiltify_trees_differ supports $ignoregitignore (nfc)
We are going to want to handle this specially.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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; |