diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase index 0ff3ea5..5fa62b5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -156,25 +156,27 @@ sub get_differs ($$) { my $f; my $rundiff = sub { my ($opts, $sfx, $fn) = @_; - my @cmd = (@git, qw(diff-tree -z --no-renames --name-only)); - push @cmd "$_:$sfx" foreach $x, $y; + $opts //= [qw(--name-only)]; + my @cmd = (@git, qw(diff-tree -z --no-renames)); + push @cmd, @$opts; + push @cmd, "$_:$sfx" foreach $x, $y; my $diffs = cmdoutput @bcmd, $x, $y; foreach $f (split /\0/, $diffs) { $fn->(); } }; - $rundiff([], '', sub { + $rundiff(undef, '', sub { $differs |= $f eq 'debian' ? D_DEB : D_UPS; }); if ($differs & D_DEB) { $differs &= ~D_DEB; - $rundiff([], ':debian', sub { + $rundiff(undef, ':debian', sub { $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB; }); } if ($differs & D_PAT_OTH) { - $rundiff([], ':debian/patches', sub { + $rundiff([qw(--name-status)], ':debian/patches', sub { }); |