From 65245f1db9a7bb30e9e620452fdc261d98794a59 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 5 Jun 2017 19:00:25 +0100 Subject: [PATCH] git-debrebase: wip rebase fixes --- git-debrebase | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/git-debrebase b/git-debrebase index e034abb9..55f92e39 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 => [] }; -- 2.30.2