From c45f0c5ad270b47d54ce07c5a9f4ed5fb57d5083 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Apr 2017 20:34:50 +0100
Subject: [PATCH] git-debrebase: git-debrebase fixes

---
 git-debrebase | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index 1b77b084..428f9e6c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -393,13 +393,13 @@ sub walk {
 	    if ($differs & D_UPS) {
 		printf $report " D_UPS" if $report;
 		push @deb_cl, {
-                    %r,
+                    %$cl,
                     SpecialMethod => 'DgitImportUpstreamUpdate',
                     $xmsg->("convert dgit import: debian changes")
                 };
 	    }
 	    push @deb_cl, {
-		%r,
+		%$cl,
 		SpecialMethod => 'DgitImportDebianUpdate',
                 $xmsg->("convert dgit import: upstream changes")
 	    };
@@ -459,9 +459,9 @@ sub walk {
 		$current_method = $cl;
 		next;
 	    }
-	    $method = $cl->{SpecialMethod} // $current_method;
+	    my $method = $cl->{SpecialMethod} // $current_method;
 	    my @parents = ($build);
-	    my $cltree = $cl->{CommitId}
+	    my $cltree = $cl->{CommitId};
 	    if ($method eq 'Debian') {
 		$read_tree_debian->($cltree);
 	    } elsif ($method eq 'Upstream') {
@@ -475,7 +475,7 @@ sub walk {
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
 		$read_tree_debian->($cltree);
-		$rm_tree_cached(qw(debian/patches));
+		$rm_tree_cached->(qw(debian/patches));
 	    } elsif ($method eq 'DgitImportUpstreamUpdate') {
 		$read_tree_upstream->($cltree);
 		push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
-- 
2.30.2