diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:39:17 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:40:02 +0100 |
commit | b2f5228398b789f75ab9742252d088233f01420e (patch) | |
tree | 853ccb46bbeecf00193314ab1b77c701484c8487 /git-debrebase | |
parent | 2bfdf4a69e6ae3ce6b94f0d1ac13b1cde8b5a5c6 (diff) |
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>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 35b75cd..bc725fa 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; } |