From abd3af0ed03160a5dc627baafe633f303e65fb4c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 12 Aug 2018 19:03:41 +0100 Subject: [PATCH] git-debrebase: walk: Move $read_tree_upstream into the loop NFC. Signed-off-by: Ian Jackson --- git-debrebase | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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)) { -- 2.30.2