From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 6 May 2011 21:00:21 +0000 (-0500)
Subject: tests: teach verify_parents to check for extra parents
X-Git-Tag: v1.7.6-rc0~86^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3fc0dbf00ba5191c6aa7090a19fb9324ca348077;p=git.git

tests: teach verify_parents to check for extra parents

Currently verify_parents only makes sure that the earlier parents of
HEAD match the commits given, and does not care if there are more
parents.  This makes it harder than one would like to check that, for
example, parent reduction works correctly when making an octopus.

Fix it by checking that HEAD^(n+1) is not a valid commit name.
Noticed while working on a new test that was supposed to create a
fast-forward one commit ahead but actually created a merge.

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index c665acdd0..17292b7ad 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -89,6 +89,7 @@ verify_parents () {
 		i=$(expr $i + 1) ||
 		return 1
 	done &&
+	test_must_fail git rev-parse --verify "HEAD^$i" &&
 	test_cmp parents.expected parents.actual
 }