summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-14 11:43:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commitbb4bf5def7c06e5451fabe8d0a7d028873d753cf (patch)
tree1aa6f3dbfae11fc93b1617f9b672228f90db5285 /git-debrebase
parent11101f17a4c7203e6285dad67a5e86b0bdbba02a (diff)
git-debrebase: wip fixes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase
index a39699a..15196fe 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -162,17 +162,17 @@ sub get_differs ($$) {
my @cmd = (@git, qw(diff-tree -z --no-renames));
push @cmd, @$opts;
push @cmd, "$_:$sfx" foreach $x, $y;
- my $diffs = cmdoutput @bcmd, $x, $y;
+ my $diffs = cmdoutput @cmd, $x, $y;
foreach $f (split /\0/, $diffs) { $fn->(); }
};
- $rundiff(undef, '', sub {
+ $rundiff->(undef, '', sub {
$differs |= $f eq 'debian' ? D_DEB : D_UPS;
});
if ($differs & D_DEB) {
$differs &= ~D_DEB;
- $rundiff(undef, ':debian', sub {
+ $rundiff->(undef, ':debian', sub {
$differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
});
die "mysterious debian changes $x..$y"
@@ -184,9 +184,9 @@ sub get_differs ($$) {
$differs &= ~D_PAT_OTH;
my $pat_oth = sub {
$differs |= D_PAT_OTH;
- no qw(exiting); last;
+ no warnings qw(exiting); last;
};
- $rundiff([qw(--name-status)], ':debian/patches', sub {
+ $rundiff->([qw(--name-status)], ':debian/patches', sub {
no warnings qw(exiting);
if (!defined $mode) {
$mode = $f; next;