Skip to content

tests: make verify_merge check that the number of parents is right

Jonathan Nieder git 1 version In review

Get series with b4
b4 am 20110506205441.GA20182@elie

Versions newest first

  1. v1 Latest2 patches 8 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2tests: eliminate unnecessary setup test assertionst/t6010-merge-base.sh t/t7600-merge.sh+97 -9911 replies
2/2tests: teach verify_parents to check for extra parentst/t7600-merge.sh+1 -02 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] tests: make verify_merge check that the number of parents is right
Quoted 3 lines · Junio C Hamano

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(-)