chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: merge: mergedbreakwaters_anchor: Check consistency
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 35b75cd67ea2bc6de01e68a3621dc919efe96ce2..bc725fa3c802679f51a98395fcec625158cb0351 100755
(executable)
--- 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;
$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;
}
}
return $best_anchor;
}