From 1d38a8e35e08d9a37393a809f8de4492759f4be3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 16:22:12 +0100 Subject: [PATCH 1/1] git-debrebase: merge: Whitespace changes Signed-off-by: Ian Jackson --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index f93adefc..771410ef 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1264,6 +1264,7 @@ sub walk ($;$$$) { or $nomerge->("interchange merge-base ($ib)'s". " breakwater ($bbw)". " != breakwaters' merge-base ($bwb)"); + grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps or $nomerge->("interchange merge-base ($ib)'s". " anchor ($ibinfo->{SeriesBase})". @@ -1271,7 +1272,6 @@ sub walk ($;$$$) { (join ' ', map { $_->{Anchor} } @$ps). ")"); - $cl->{MergeInterchangeBaseInfo} = $ibinfo; $cl->{MergeBestAnchor} = $best_anchor; push @brw_cl, { -- 2.30.2