From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Oct 2016 22:06:24 +0000 (+0000)
Subject: Test suite: Change t-has-parent to t-has-parent-or-is
X-Git-Tag: archive/debian/2.9~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d7a8b709fff008ddc507f497b055f2f883b733bf;p=dgit.git

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

diff --git a/tests/lib b/tests/lib
index 6c55cba2..23daeace 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 "*)	;;
diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index 394a2148..c83a5d36 100755
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -21,7 +21,7 @@ copy-check-good () {
 	git diff $vtag
 	t-refs-same refs/remotes/dgit/dgit/stable
 	t-ref-head
-	t-has-parent HEAD $vtag
+	t-has-parent-or-is HEAD $vtag
 }
 
 copy-check () {