From 410c3428ed42bc0978e2917236e95cd5f860864f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 20 Mar 2014 19:23:06 -0400 Subject: [PATCH] t0001: drop subshells just for "cd" Many tests do something like: ( mkdir foo && cd foo && git init ) You can do the same these days with "git init foo", which makes the tests shorter and simpler to read. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t0001-init.sh | 56 +++++++++----------------------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index d8c00b44cc..bbc9cb60dd 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -24,11 +24,7 @@ check_config () { } test_expect_success 'plain' ' - ( - mkdir plain && - cd plain && - git init - ) && + git init plain && check_config plain/.git false unset ' @@ -90,11 +86,7 @@ test_expect_success 'plain with GIT_WORK_TREE' ' ' test_expect_success 'plain bare' ' - ( - mkdir plain-bare-1 && - cd plain-bare-1 && - git --bare init - ) && + git --bare init plain-bare-1 && check_config plain-bare-1 true unset ' @@ -112,12 +104,7 @@ test_expect_success 'GIT_DIR bare' ' ' test_expect_success 'init --bare' ' - - ( - mkdir init-bare.git && - cd init-bare.git && - git init --bare - ) && + git init --bare init-bare.git && check_config init-bare.git true unset ' @@ -166,26 +153,14 @@ test_expect_success 'reinit' ' test_expect_success 'init with --template' ' mkdir template-source && echo content >template-source/file && - ( - mkdir template-custom && - cd template-custom && - git init --template=../template-source - ) && + git init --template=../template-source template-custom && test_cmp template-source/file template-custom/.git/file ' test_expect_success 'init with --template (blank)' ' - ( - mkdir template-plain && - cd template-plain && - git init - ) && + git init template-plain && test_path_is_file template-plain/.git/info/exclude && - ( - mkdir template-blank && - cd template-blank && - git init --template= - ) && + git init --template= template-blank && test_path_is_missing template-blank/.git/info/exclude ' @@ -207,11 +182,7 @@ test_expect_success 'init with init.templatedir set' ' test_expect_success 'init --bare/--shared overrides system/global config' ' test_config_global core.bare false && test_config_global core.sharedRepository 0640 && - ( - mkdir init-bare-shared-override && - cd init-bare-shared-override && - git init --bare --shared=0666 - ) && + git init --bare --shared=0666 init-bare-shared-override && check_config init-bare-shared-override true unset && test x0666 = \ x`git config -f init-bare-shared-override/config core.sharedRepository` @@ -219,22 +190,13 @@ test_expect_success 'init --bare/--shared overrides system/global config' ' test_expect_success 'init honors global core.sharedRepository' ' test_config_global core.sharedRepository 0666 && - ( - mkdir shared-honor-global && - cd shared-honor-global && - git init - ) && + git init shared-honor-global && test x0666 = \ x`git config -f shared-honor-global/.git/config core.sharedRepository` ' test_expect_success 'init rejects insanely long --template' ' - ( - insane=$(printf "x%09999dx" 1) && - mkdir test && - cd test && - test_must_fail git init --template=$insane - ) + test_must_fail git init --template=$(printf "x%09999dx" 1) test ' test_expect_success 'init creates a new directory' ' -- 2.11.4.GIT