From 2ba1d04106ad92d32e7614ad9d94fce48c363076 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Feb 2014 22:05:35 +0000
Subject: [PATCH 1/1] tests/lib: break out t-untar and use it in t-worktree

---
 tests/lib | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 () {
-- 
2.30.2