chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8495e97
)
git-debrebase: move --name-only
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 9 Jul 2017 13:04:27 +0000
(14:04 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 0ff3ea55e8fb7dd62bb15723ad3fe67bc36ef3d5..5fa62b55b848e927556717379897f27df1401edd 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-156,25
+156,27
@@
sub get_differs ($$) {
my $f;
my $rundiff = sub {
my ($opts, $sfx, $fn) = @_;
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->(); }
};
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;
$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) {
$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 {
});
});