Junio C Hamano wrote: > Side note: I think verify_parents is buggy. It only makes sure > that the earlier parents of HEAD match the commits given, and does > not care if there actually are more parents. How about this? Jonathan Nieder (2): tests: eliminate unnecessary setup test assertions tests: teach verify_parents to check for extra parents t/t6010-merge-base.sh | 62 +++++++++++----------- t/t7600-merge.sh | 135 ++++++++++++++++++++++++------------------------- 2 files changed, 98 insertions(+), 99 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html