wip fixes

diff --git a/git-debrebase b/git-debrebase
index a39699ae5dfd08cf7ff674999a1eee1148e826df..15196fe42eba2214e4835ee62c84c62d6455eb45 100755 (executable)
--- 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;