From a264b74abe1251ab73163cfb9b5a04ff3d41eaf9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 15:48:17 +0100 Subject: [PATCH] git-debrebase: merge: Remove a redundant check MergedBreakwaters commits are now handled by a completely other branch of the if, so this check is now redundant. Signed-off-by: Ian Jackson --- git-debrebase | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-debrebase b/git-debrebase index bc725fa3..499cda2e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1222,9 +1222,6 @@ sub walk ($;$$$) { $build_start->('MergedBreakwaters', $cur); } - $nomerge->("alleged merged-breakwater is not a breakwater") - unless $ty eq 'VanillaMerge'; - my $bwb = cmdoutput @bwbcmd; # OK, now we have a breakwater base, but we need the merge -- 2.30.2