From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 16:29:34 +0000 (+0100)
Subject: git-debrebase: merge: Introduce global mwrecknote sub
X-Git-Tag: archive/debian/6.7~100
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8f9aeae3d8ffdb6041b6accb008bdbe755f75183;hp=f8b71fe47b3216f14c31c3c2c9075ce32c0cc975;p=dgit.git

git-debrebase: merge: Introduce global mwrecknote sub

NFC

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

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;