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

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>
---

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;
 }