aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-30 12:00:42 +0000
committerJunio C Hamano <gitster@pobox.com>2010-08-31 12:12:02 -0700
commit0d314ce834df9ad6bb5d6e9583c38aefd047fc9b (patch)
tree625925df169bc567171f3e57c1e50d7cd38eb399
parent07431fc8dc136573f31cb9db6605f49f792c8b10 (diff)
downloadgit-0d314ce834df9ad6bb5d6e9583c38aefd047fc9b.tar.gz
git-0d314ce834df9ad6bb5d6e9583c38aefd047fc9b.tar.xz
test-lib: use subshell instead of cd $new && .. && cd $old
Change the test_create_repo code added in v1.2.2~6 to use a subshell instead of keeping track of the old working directory and cd-ing back when it's done. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 198dd860a..7c9fe7ab4 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -650,14 +650,14 @@ test_when_finished () {
test_create_repo () {
test "$#" = 1 ||
error "bug in the test script: not 1 parameter to test-create-repo"
- owd=`pwd`
repo="$1"
mkdir -p "$repo"
- cd "$repo" || error "Cannot setup test environment"
- "$GIT_EXEC_PATH/git-init" "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
- error "cannot run git init -- have you built things yet?"
- mv .git/hooks .git/hooks-disabled
- cd "$owd"
+ (
+ cd "$repo" || error "Cannot setup test environment"
+ "$GIT_EXEC_PATH/git-init" "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
+ error "cannot run git init -- have you built things yet?"
+ mv .git/hooks .git/hooks-disabled
+ ) || exit
}
test_done () {