X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=2dffdacee0f614fa22024fa3c6e515bc253aa22d;hb=2ba1d04106ad92d32e7614ad9d94fce48c363076;hp=fb6b2fc068273ab2989250637a80eb58846d1407;hpb=62c2e5bde449901e1963adb288b4c31b46db3776;p=dgit.git

diff --git a/tests/lib b/tests/lib
index fb6b2fc0..2dffdace 100644
--- a/tests/lib
+++ b/tests/lib
@@ -39,9 +39,19 @@ fail () {
 	exit 1
 }
 
+t-untar () {
+	local tarfile=$1.tar
+	local edittree=$1.edit
+	if test -d "$edittree"; then
+		cp -al "$edittree"/* .
+	else
+		tar xf "$tarfile"
+	fi
+}
+
 t-worktree () {
 	rm -rf $p
-	tar xf $troot/worktrees/${p}_$1.tar
+	t-untar $troot/worktrees/${p}_$1
 }
 
 t-git () {
@@ -49,11 +59,7 @@ t-git () {
 	v=$2
 	mkdir -p $tmp/git
 	local gs=$troot/git-srcs/${p}_$v.git
-	if test -f $gs.edit; then
-		cp -al $gs.edit $tmp/git/${p}.git
-	else
-		(set -e; cd $tmp/git; tar xf $gs.tar)
-	fi
+	(set -e; cd $tmp/git; t-untar $gs)
 }
 
 t-git-none () {