diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-06-05 19:00:25 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 65245f1db9a7bb30e9e620452fdc261d98794a59 (patch) | |
tree | 6e4b52f6ef07a9b093f3b4d34767441a2b7890fe /git-debrebase | |
parent | e3aeaf7586f5c030f15fa722fbee8c6952760ba1 (diff) |
git-debrebase: wip rebase fixes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/git-debrebase b/git-debrebase index e034abb..55f92e3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -340,14 +340,6 @@ sub walk { my $rewrite_from_here = sub { push @processed, { SpecialMethod => 'StartRewrite' }; }; - my $bomb = sub { # usage: return $bomb->(); - print $report " Unprocessable" if $report; - $prprdelim->(); - if ($nogenerate) { - return (undef,undef); - } - die "commit $cur: Cannot cope with this commit"; - }; my $cur = $input; @@ -360,6 +352,15 @@ sub walk { $prdelim = "\n"; }; + my $bomb = sub { # usage: return $bomb->(); + print $report " Unprocessable" if $report; + $prprdelim->(); + if ($nogenerate) { + return (undef,undef); + } + die "commit $cur: Cannot cope with this commit"; + }; + for (;;) { if (!defined $cur) { push @deb_cl, { ExactlyParents => [] }; |