summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-12 19:03:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-12 19:03:41 +0100
commitabd3af0ed03160a5dc627baafe633f303e65fb4c (patch)
tree88e75bf00681a99c467a9ae7c17513616ee46640
parentd62795ff059d1c5854f49d6ea84e2bfebf94e621 (diff)
git-debrebase: walk: Move $read_tree_upstream into the loop
NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase11
1 files changed, 6 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase
index 482c432..24aefbe 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)) {