autopkgtests: break out fetch-nogit

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 5ce17d6c56c36c22137d97ebdfc1413efbbb958f..8823b287ba555d873f30405b84b59aee1b9eb8e8 100644 (file)
--- 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