git-debrebase: merge: Break out $mdebug

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 2a2d1ed2c81e0a83f987ccdeb8e2c6d2d426254b..62381e1de83c8fc1440e578593f0bf8422cdb632 100755 (executable)
--- 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)
@@ -552,8 +552,8 @@ sub merge_series ($$;@) {
        runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
        runcmd @git, qw(add .);
        runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
-       printdebug sprintf "merge_series done debug=%s\n",
-           git_rev_parse 'HEAD';
+       my $mdebug = git_rev_parse 'HEAD';
+       printdebug sprintf "merge_series done debug=%s\n", $mdebug;
     };
     printdebug "merge_series returns $result\n";
     return $result;
@@ -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};