X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=401331a2a8378eeca25aded59e15de76475fb8e5;hb=cd50f9c3ca13efec84cc82fc20798e883fa6ba97;hp=5d8e742dd371aba7cad2dd22ee8908ce93e630f8;hpb=19669291927ee91dbea3c47a412161b32859df88;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 5d8e742d..401331a2 100644
--- a/tests/lib
+++ b/tests/lib
@@ -188,6 +188,8 @@ t-git-merge-base () {
 }
 
 t-has-ancestor () {
+	# t-has-ancestor ANCESTOR
+	# (CHILD is implicit, HEAD)
 	local now=`git rev-parse HEAD`
 	local ancestor=`git rev-parse $1^{}`
 	local mbase=`t-git-merge-base $ancestor $now`
@@ -196,6 +198,18 @@ t-has-ancestor () {
 	fi
 }
 
+t-has-parent () {
+	# t-has-parent CHILD PARENT
+	local child=$1
+	local parent=$2
+	local parents=$(git show --pretty=format:' %P ' "$child")
+	parent=$(git rev-parse "$parent~0")
+	case "$parents" in
+	*" $parent "*)	;;
+	*)	fail "child $child lacks parent $parent" ;;
+	esac
+}
+
 t-prep-newpackage () {
 	t-select-package $1
 	v=$2
@@ -278,7 +292,7 @@ t-archive-updated () {
 
 t-archive-process-incoming () {
 	local suite=$1
-	mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+	mv $tmp/incoming/${p}_* $tmp/mirror/pool/main/
 	t-archive-query "$suite"
 }
 
@@ -475,8 +489,8 @@ t-ref-head () {
 t-ref-same-val () {
 	local name="$1"
 	local val=$2
-	case "$t_ref_val" in
-	'')		;;
+	case "${t_ref_val-unset}" in
+	unset)		;;
 	"$val")		;;
 	*)		fail "ref varies: $name:\
  ${val:-nothing} != ${t_ref_val:-nothing}" ;;
@@ -485,7 +499,7 @@ t-ref-same-val () {
 }
 
 t-refs-same-start () {
-	t_ref_val=''
+	unset t_ref_val
 }
 
 t-refs-same () {