X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=8823b287ba555d873f30405b84b59aee1b9eb8e8;hb=aa763397e6222caf15f1f4c86e05162b8764f3dc;hp=5ce17d6c56c36c22137d97ebdfc1413efbbb958f;hpb=34490655252a304aff3fecc27dc81f4bc4e6d3fd;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 5ce17d6c..8823b287 100644
--- a/tests/lib
+++ b/tests/lib
@@ -22,15 +22,25 @@ ln $troot/ssh ssh
 mkdir $tmp/gnupg
 export GNUPGHOME=$tmp/gnupg
 
-t-git () {
-	mkdir -p $tmp/git
-	cp -al $troot/git-srcs/$1 git/.
+t-worktree () {
+	rm -rf $p
+	tar xf $troot/worktrees/${p}_$1.tar
 }
 
 t-git-none () {
 	mkdir -p $tmp/git
 }
 
+t-has-ancestor () {
+	local ancestor=`git rev-parse $1`
+	local now=`git rev-parse HEAD`
+	local mbase=`git merge-base $ancestor $now`
+	if [ x$mbase != x$ancestor ]; then
+		echo "not ff $ancestor..$now, $mbase != $ancestor"
+		exit 1
+	fi
+}	
+
 t-archive () {
 	p=$1
 	v=$2