chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: allow opts
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index b2839d59bb66d065d5e94df80d4dc65490593e5c..0ff3ea55e8fb7dd62bb15723ad3fe67bc36ef3d5 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-155,26
+155,28
@@
sub get_differs ($$) {
my $f;
my $rundiff = sub {
my $f;
my $rundiff = sub {
- my ($sfx, $fn) = @_;
- my @cmd = (@git, qw(diff-tree -z --name-only));
+ my ($
opts, $
sfx, $fn) = @_;
+ my @cmd = (@git, qw(diff-tree -z --n
o-renames --n
ame-only));
push @cmd "$_:$sfx" foreach $x, $y;
my $diffs = cmdoutput @bcmd, $x, $y;
foreach $f (split /\0/, $diffs) { $fn->(); }
};
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 {
+
+ });