From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 14:31:39 +0000 (+0100)
Subject: git-debrebase: Rename $want_tree_ to $want_
X-Git-Tag: archive/debian/6.7~54
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=673c212d8927c8bc5fdef01bdfc16d0b000521de;p=dgit.git

git-debrebase: Rename $want_tree_ to $want_

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 3d4bb607..5573824d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1436,11 +1436,11 @@ sub walk ($;$$$) {
     in_workarea sub {
 	mkdir $rd or $!==EEXIST or die $!;
 	my $current_method;
-	my $want_tree_debian = $build;
-	my $want_tree_upstream = $build;
+	my $want_debian = $build;
+	my $want_upstream = $build;
 
-	my $read_tree_upstream = sub { ($want_tree_upstream) = @_; };
-	my $read_tree_debian = sub { ($want_tree_debian) = @_; };
+	my $read_tree_upstream = sub { ($want_upstream) = @_; };
+	my $read_tree_debian = sub { ($want_debian) = @_; };
 
 	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
@@ -1530,7 +1530,7 @@ sub walk ($;$$$) {
 		}
 	    }
 	    if ($rewriting || $opt_careful) {
-		read_tree_upstream $want_tree_upstream, 0, $want_tree_debian;
+		read_tree_upstream $want_upstream, 0, $want_debian;
 
 		my $newtree = cmdoutput @git, qw(write-tree);
 		my $ch = $cl->{Hdr};