From 20ffd976c0933f551e667d80737d83849f400d45 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 15:27:56 +0000
Subject: [PATCH] git-debrebase: insist that breakwater merges are merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git-debrebase b/git-debrebase
index 28cbc889..6d8091e6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -375,6 +375,9 @@ sub classify ($) {
 	$r->{Msg} =~ m{^\[git-debrebase breakwater.*\]$}m;
 
     if (@p == 1) {
+	if ($claims_to_be_breakwater) {
+	    return $unknown->("single-parent git-debrebase breakwater \`merge'");
+	}
 	my $d = $r->{Parents}[0]{Differs};
 	if ($d == D_PAT_ADD) {
 	    return $classify->(qw(AddPatches));
-- 
2.30.2