summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-09 14:04:27 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit167be8cc683c1f8b47d5f05f7792c04d57fac092 (patch)
tree8b6133b00f5ca8141c9d462f9004e0248061a133 /git-debrebase
parent8495e97503b30d0c5a82e5e87758d90dfaf60414 (diff)
git-debrebase: move --name-only
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase12
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 {
});