From b2f5228398b789f75ab9742252d088233f01420e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:39:17 +0100
Subject: [PATCH] git-debrebase: merge: mergedbreakwaters_anchor: Check
 consistency

Check that the result contains all the other anchors.  This is
ensured by walk, and required of VanillaMerges.

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

diff --git a/git-debrebase b/git-debrebase
index 35b75cd6..bc725fa3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -846,6 +846,8 @@ sub mergedbreakwaters_anchor ($) {
 	$best_anchor = $panchor
 	    if !defined $best_anchor
 	    or is_fast_fwd $best_anchor, $panchor;
+	fail "inconsistent anchors in merged-breakwaters $p->{CommitId}"
+	    unless is_fast_fwd $panchor, $best_anchor;
     }
     return $best_anchor;
 }
-- 
2.30.2