Test suite: Change t-has-parent to t-has-parent-or-is

This is only used by the inarchivecopy test.  And that ought not to
fail if there is no into-suite pseudomerge: that is, when the suite
branch contains the intended commit, rather than something merging the
intended commit into the suite branch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/lib b/tests/lib
index 6c55cba..23daeac 100644
--- a/tests/lib
+++ b/tests/lib
@@ -198,11 +198,11 @@ t-has-ancestor () {
 	fi
 }
 
-t-has-parent () {
-	# t-has-parent CHILD PARENT
+t-has-parent-or-is () {
+	# t-has-parent-or-is CHILD PARENT
 	local child=$1
 	local parent=$2
-	local parents=$(git show --pretty=format:' %P ' "$child")
+	local parents=$(git show --pretty=format:' %P %H ' "$child")
 	parent=$(git rev-parse "$parent~0")
 	case "$parents" in
 	*" $parent "*)	;;