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:
53d9de1
)
git-debrebase: allow opts
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 9 Jul 2017 13:02:41 +0000
(14:02 +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 bcf49de8baf5cd816bd76ea83642eb4066f9b32f..0ff3ea55e8fb7dd62bb15723ad3fe67bc36ef3d5 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-155,26
+155,26
@@
sub get_differs ($$) {
my $f;
my $rundiff = sub {
my $f;
my $rundiff = sub {
- my ($sfx, $fn) = @_;
+ my ($
opts, $
sfx, $fn) = @_;
my @cmd = (@git, qw(diff-tree -z --no-renames --name-only));
push @cmd "$_:$sfx" foreach $x, $y;
my $diffs = cmdoutput @bcmd, $x, $y;
foreach $f (split /\0/, $diffs) { $fn->(); }
};
my @cmd = (@git, qw(diff-tree -z --no-renames --name-only));
push @cmd "$_:$sfx" foreach $x, $y;
my $diffs = cmdoutput @bcmd, $x, $y;
foreach $f (split /\0/, $diffs) { $fn->(); }
};
- $rundiff('', sub {
+ $rundiff(
[],
'', 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(
[],
':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(
[],
':debian/patches', sub {
});
});