From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:27:07 +0000 (+0100)
Subject: git-debrebase: merge: Pass wreckage hashref to merge_series
X-Git-Tag: archive/debian/6.7~110
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=27b7f56727ea182349a38136977553fc5a256394;hp=c10954df2a6f7ed9f12e12f6e65049d78c9672e4;ds=sidebyside

git-debrebase: merge: Pass wreckage hashref to merge_series

NFC so far.

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

diff --git a/git-debrebase b/git-debrebase
index 2a2d1ed2..830cfd5e 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -362,8 +362,8 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
-sub merge_series ($$;@) {
-    my ($newbase, $base_q, @input_qs) = @_;
+sub merge_series ($$$;@) {
+    my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
     # $base_q{SeriesBase}  $input_qs[]{SeriesBase}
     # $base_q{SeriesTip}   $input_qs[]{SeriesTip}
     # ^ specifies several patch series (currently we only support exactly 2)
@@ -1392,7 +1392,7 @@ sub walk ($;$$$) {
 	    } elsif ($method eq 'MergeMergeSeries') {
 		print "Running merge resolution for $cl->{CommitId}...\n";
 		$build = merge_series
-		    $build,
+		    $build, $cl->{MergeWreckNotes},
 		    $cl->{MergeInterchangeBaseInfo},
 		    @{ $cl->{Parents} };
 		$last_anchor = $cl->{MergeBestAnchor};