git-debrebase: merge: Record the new-base in the wreckage.

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

diff --git a/git-debrebase b/git-debrebase
index 18bc21f0dbb965b48f4aebc4c8a07d7e67e4ba3e..910e444df28aca907c99b7ac56c63cd32f65ccf7 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1470,6 +1470,7 @@ sub walk ($;$$$) {
                @parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
            } elsif ($method eq 'MergeMergeSeries') {
                print "Running merge resolution for $cl->{CommitId}...\n";
                @parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
            } elsif ($method eq 'MergeMergeSeries') {
                print "Running merge resolution for $cl->{CommitId}...\n";

+               $mwrecknote->('new-base', $build);

                $build = merge_series
                    $build, $cl->{MergeWreckNotes},
                    $cl->{MergeInterchangeBaseInfo},
                $build = merge_series
                    $build, $cl->{MergeWreckNotes},
                    $cl->{MergeInterchangeBaseInfo},