From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Jun 2017 18:00:25 +0000 (+0100)
Subject: git-debrebase: wip rebase fixes
X-Git-Tag: archive/debian/5.0~350
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=65245f1db9a7bb30e9e620452fdc261d98794a59

git-debrebase: wip rebase fixes
---

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 => [] };