From f92ca512fda3dbcb85d073065d58b4cda26eed42 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 2 Jul 2016 10:53:25 +0100 Subject: Test suite: tartree-edit: break out git_manip_play (nfc) --- tests/tartree-edit | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'tests/tartree-edit') diff --git a/tests/tartree-edit b/tests/tartree-edit index 14eec68..5a7c6b4 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 -- cgit v1.2.3