From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Aug 2018 18:03:41 +0000 (+0100)
Subject: git-debrebase: walk: Move $read_tree_upstream into the loop
X-Git-Tag: archive/debian/6.7~58
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=abd3af0ed03160a5dc627baafe633f303e65fb4c

git-debrebase: walk: Move $read_tree_upstream into the loop

NFC.

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

diff --git a/git-debrebase b/git-debrebase
index 482c432d..24aefbe5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1423,11 +1423,6 @@ sub walk ($;$$$) {
 
     my $rewriting = 0;
 
-    my $read_tree_upstream = sub {
-	my ($treeish) = @_;
-	read_tree_upstream $treeish, 0, $build;
-    };
-
     $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();
@@ -1440,6 +1435,12 @@ sub walk ($;$$$) {
 	mkdir $rd or $!==EEXIST or die $!;
 	my $current_method;
 	runcmd @git, qw(read-tree), $build;
+
+	my $read_tree_upstream = sub {
+	    my ($treeish) = @_;
+	    read_tree_upstream $treeish, 0, $build;
+	};
+
 	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
 			qw(Upstream), (reverse @upp_cl)) {