From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Jul 2016 09:53:25 +0000 (+0100)
Subject: Test suite: tartree-edit: break out git_manip_play (nfc)
X-Git-Tag: archive/debian/2.0~353
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f92ca512fda3dbcb85d073065d58b4cda26eed42;p=dgit.git

Test suite: tartree-edit: break out git_manip_play (nfc)
---

diff --git a/tests/tartree-edit b/tests/tartree-edit
index 14eec68e..5a7c6b43 100755
--- a/tests/tartree-edit
+++ b/tests/tartree-edit
@@ -2,6 +2,17 @@
 set -e
 fail () { echo >&2 "$0: $*"; exit 1; }
 
+play=.git/tartree-edit-work
+
+git_manip_play () {
+	local wd=$(pwd)
+	case "$wd" in
+	*.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
+	esac
+	rm -rf $play
+	mkdir $play
+}
+
 case "$#.$1" in
 2.edit|2.done)	mode="$1"; arg="$2" ;;
 3.gitfetchinfo)	mode="$1"; arg="$2"; remote="$3" ;;
@@ -56,13 +67,7 @@ gitfetchinfo_perhaps_commit () {
 }
 
 tryat_gitfetchinfo () {
-	local wd=$(pwd)
-	case "$wd" in
-	*.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
-	esac
-	local play=.git/tartree-edit-work
-	rm -rf $play
-	mkdir $play
+	git_manip_play
 	if test -d "$b.edit"; then
 		cp -a "$b.edit"/. "$play"/.
 	else