From 8f9aeae3d8ffdb6041b6accb008bdbe755f75183 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 17:29:34 +0100 Subject: [PATCH] git-debrebase: merge: Introduce global mwrecknote sub NFC Signed-off-by: Ian Jackson --- git-debrebase | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/git-debrebase b/git-debrebase index d1017421..277e0f84 100755 --- a/git-debrebase +++ b/git-debrebase @@ -362,6 +362,11 @@ sub gbp_pq_export ($$$) { # our own patch identification algorithm? # this is an alternative strategy +sub mwrecknote ($$$) { + my ($wrecknotes, $reftail, $commitish) = @_; + $wrecknotes->{$reftail} = $commitish; +} + sub merge_series ($$$;@) { my ($newbase, $wrecknotes, $base_q, @input_qs) = @_; # $base_q{SeriesBase} $input_qs[]{SeriesBase} @@ -388,10 +393,7 @@ sub merge_series ($$$;@) { my $result; - my $mwrecknote = sub { - my ($reftail, $commitish) = @_; - $wrecknotes->{$reftail} = $commitish; - }; + my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); }; local $workarea = fresh_playground "$playprefix/merge"; my $seriesfile = "debian/patches/series"; @@ -1039,10 +1041,7 @@ sub walk ($;$$$) { fail "something useful about failed merge attempt @_ xxx".Dumper($cl); }; - my $mwrecknote = sub { - my ($reftail, $commitish) = @_; - $cl->{MergeWreckNotes}{$reftail} = $commitish; - }; + my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); }; my $last_anchor; -- 2.30.2