From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 14:48:17 +0000 (+0100)
Subject: git-debrebase: merge: Remove a redundant check
X-Git-Tag: archive/debian/6.7~116
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a264b74abe1251ab73163cfb9b5a04ff3d41eaf9;hp=b2f5228398b789f75ab9742252d088233f01420e

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 <ijackson@chiark.greenend.org.uk>
---

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