From b11760cf2a4d85e63085db5ed504804e6ffe36a8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Apr 2017 20:52:43 +0100
Subject: git-debrebase: git-debrebase fixes

---
 git-debrebase | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'git-debrebase')

diff --git a/git-debrebase b/git-debrebase
index 428f9e6..d6bd8a5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -110,6 +110,11 @@ use Data::Dumper;
 
 use Debian::Dgit qw(:DEFAULT $wa);
 
+sub badusage ($) {
+    my ($m) = @_;
+    die "bad usage: $m\n";
+}
+
 sub cfg ($) {
     my ($k) = @_;
     $/ = "\0";
@@ -487,28 +492,28 @@ sub walk {
 	    my $ch = $cl->{Hdr};
 	    $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
 	    $ch =~ s{^parent .*\n}{}m;
-	    $ch =~ s{(?=^author}{
+	    $ch =~ s{(?=^author)}{
 		map { "parent $_\n" } @parents
 	    }me or confess "$ch ?";
-	    if ($rewrite) {
+	    if ($rewriting) {
 		$ch =~ s{^committer .*$}{$committer_authline}m
 		    or confess "$ch ?";
 	    }
-	    my $cf = "$rd/m$rewrite"
-		open CD, ">", $cf or die $!;
-	    print CD $ch, "\n", $cl->{Msg}; or die $!;
+	    my $cf = "$rd/m$rewriting";
+	    open CD, ">", $cf or die $!;
+	    print CD $ch, "\n", $cl->{Msg} or die $!;
 	    close CD or die $!;
 	    my @cmd = (@git, qw(hash-object));
-	    push @cmd, qw(-w) if $rewrite;
+	    push @cmd, qw(-w) if $rewriting;
 	    push @cmd, qw(-t commit), $cf;
 	    my $newcommit = cmdoutput @cmd;
-	    confess "$ch ?" unless $rewrite or $newcommit eq $cl->{CommitId};
+	    confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
 	    $build = $newcommit;
 	}
     };
 
     runcmd @git, qw(diff-tree --quiet),
-	map { $wantdebonly ? "$_:debian" : $_ },
+	map { $wantdebonly ? "$_:debian" : $_ }
 	$input, $build;
 
     return ($build, $breakwater);
-- 
cgit v1.2.3