X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=bc725fa3c802679f51a98395fcec625158cb0351;hb=b2f5228398b789f75ab9742252d088233f01420e;hp=35b75cd67ea2bc6de01e68a3621dc919efe96ce2;hpb=2bfdf4a69e6ae3ce6b94f0d1ac13b1cde8b5a5c6;p=dgit.git 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; }