From: Jonathan Nieder Date: Fri, 06 May 2011 20:54:41 GMT Subject: [PATCH 0/2] tests: make verify_merge check that the number of parents is right Message-ID: <20110506205441.GA20182@elie> In-Reply-To: <7vsjsuc704.fsf@alter.siamese.dyndns.org> 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(-)