diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-06-15 00:20:02 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 96b80209efcfc22f5c7e5251b1e1878cad797b5a (patch) | |
tree | 3269f40d185b978b7d930b33988831282ce765d3 /git-debrebase | |
parent | 85644f90c4b887d4b60b175f6cda8446e1e5bd29 (diff) |
git-debrebase: fixes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-debrebase b/git-debrebase index 7b64bf5..4fb5e91 100755 --- a/git-debrebase +++ b/git-debrebase @@ -342,13 +342,6 @@ sub walk { push @brw_cl, $sp_cl; push @processed, $sp_cl; }; - my $build_start = sub { - my ($msg, $parents) = @_; - $prline->(" $msg"); - push @brw_cl, { ExactlyParents => $parents }; - no qw(exiting); last; - }; - my $cur = $input; my $prdelim = ""; @@ -360,6 +353,13 @@ sub walk { $prdelim = "\n"; }; + my $build_start = sub { + my ($msg, $parents) = @_; + $prline->(" $msg"); + push @brw_cl, { ExactlyParents => $parents }; + no warnings qw(exiting); last; + }; + my $bomb = sub { # usage: return $bomb->(); print $report " Unprocessable" if $report; $prprdelim->(); @@ -389,7 +389,7 @@ sub walk { $cur = $p0; next; } elsif ($ty eq 'BreakwaterStart') { - $build_start('FirstPackaging',[$cur]}; + $build_start->('FirstPackaging',[$cur]); } elsif ($ty eq 'Upstream') { push @upp_cl, $cl; $cur = $p0; @@ -464,7 +464,7 @@ sub walk { } $prline->(" Import"); $rewrite_from_here->(); - $upp_limit //= $#upp; # further, deeper, patches discarded + $upp_limit //= $#upp_cl; # further, deeper, patches discarded $cur = $ovwr; next; } else { |