From e8ac0f9218a53a4dab9e2e1efe0ec696b6484011 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 20:24:20 +0100 Subject: [PATCH] git-debrebase: merge: Record the new-base in the wreckage. Signed-off-by: Ian Jackson --- git-debrebase | 1 + 1 file changed, 1 insertion(+) diff --git a/git-debrebase b/git-debrebase index 18bc21f0..910e444d 100755 --- 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"; + $mwrecknote->('new-base', $build); $build = merge_series $build, $cl->{MergeWreckNotes}, $cl->{MergeInterchangeBaseInfo}, -- 2.30.2