t0001: use test_must_fail

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 9fb582b192e7d44856d3687234de922217e511f4..4560bba559c15dfb497387bc94f16d294d08dfd0 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -12,8 +12,8 @@ check_config () {
                echo "expected a directory $1, a file $1/config and $1/refs"
                return 1
        fi
-       bare=$(GIT_CONFIG="$1/config" git config --bool core.bare)
-       worktree=$(GIT_CONFIG="$1/config" git config core.worktree) ||
+       bare=$(cd "$1" && git config --bool core.bare)
+       worktree=$(cd "$1" && git config core.worktree) ||
        worktree=unset
 
        test "$bare" = "$2" && test "$worktree" = "$3" || {
@@ -25,7 +25,6 @@ check_config () {
 
 test_expect_success 'plain' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE &&
                mkdir plain &&
                cd plain &&
                git init
@@ -35,7 +34,6 @@ test_expect_success 'plain' '
 
 test_expect_success 'plain nested in bare' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE &&
                git init --bare bare-ancestor.git &&
                cd bare-ancestor.git &&
                mkdir plain-nested &&
@@ -47,7 +45,6 @@ test_expect_success 'plain nested in bare' '
 
 test_expect_success 'plain through aliased command, outside any git repo' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE &&
                HOME=$(pwd)/alias-config &&
                export HOME &&
                mkdir alias-config &&
@@ -65,7 +62,6 @@ test_expect_success 'plain through aliased command, outside any git repo' '
 
 test_expect_failure 'plain nested through aliased command' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE &&
                git init plain-ancestor-aliased &&
                cd plain-ancestor-aliased &&
                echo "[alias] aliasedinit = init" >>.git/config &&
@@ -78,7 +74,6 @@ test_expect_failure 'plain nested through aliased command' '
 
 test_expect_failure 'plain nested in bare through aliased command' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE &&
                git init --bare bare-ancestor-aliased.git &&
                cd bare-ancestor-aliased.git &&
                echo "[alias] aliasedinit = init" >>config &&
@@ -90,21 +85,12 @@ test_expect_failure 'plain nested in bare through aliased command' '
 '
 
 test_expect_success 'plain with GIT_WORK_TREE' '
-       if (
-               sane_unset GIT_DIR &&
-               mkdir plain-wt &&
-               cd plain-wt &&
-               GIT_WORK_TREE=$(pwd) git init
-       )
-       then
-               echo Should have failed -- GIT_WORK_TREE should not be used
-               false
-       fi
+       mkdir plain-wt &&
+       test_must_fail env GIT_WORK_TREE="$(pwd)/plain-wt" git init plain-wt
 '
 
 test_expect_success 'plain bare' '
        (
-               sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
                mkdir plain-bare-1 &&
                cd plain-bare-1 &&
                git --bare init
@@ -113,22 +99,15 @@ test_expect_success 'plain bare' '
 '
 
 test_expect_success 'plain bare with GIT_WORK_TREE' '
-       if (
-               sane_unset GIT_DIR GIT_CONFIG &&
-               mkdir plain-bare-2 &&
-               cd plain-bare-2 &&
-               GIT_WORK_TREE=$(pwd) git --bare init
-       )
-       then
-               echo Should have failed -- GIT_WORK_TREE should not be used
-               false
-       fi
+       mkdir plain-bare-2 &&
+       test_must_fail \
+               env GIT_WORK_TREE="$(pwd)/plain-bare-2" \
+               git --bare init plain-bare-2
 '
 
 test_expect_success 'GIT_DIR bare' '
 
        (
-               sane_unset GIT_CONFIG &&
                mkdir git-dir-bare.git &&
                GIT_DIR=git-dir-bare.git git init
        ) &&
@@ -138,7 +117,6 @@ test_expect_success 'GIT_DIR bare' '
 test_expect_success 'init --bare' '
 
        (
-               sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
                mkdir init-bare.git &&
                cd init-bare.git &&
                git init --bare
@@ -149,7 +127,6 @@ test_expect_success 'init --bare' '
 test_expect_success 'GIT_DIR non-bare' '
 
        (
-               sane_unset GIT_CONFIG &&
                mkdir non-bare &&
                cd non-bare &&
                GIT_DIR=.git git init
@@ -160,7 +137,6 @@ test_expect_success 'GIT_DIR non-bare' '
 test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
 
        (
-               sane_unset GIT_CONFIG &&
                mkdir git-dir-wt-1.git &&
                GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
        ) &&
@@ -168,23 +144,16 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
 '
 
 test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
-
-       if (
-               sane_unset GIT_CONFIG &&
-               mkdir git-dir-wt-2.git &&
-               GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init
-       )
-       then
-               echo Should have failed -- --bare should not be used
-               false
-       fi
+       mkdir git-dir-wt-2.git &&
+       test_must_fail env \
+               GIT_WORK_TREE="$(pwd)" \
+               GIT_DIR=git-dir-wt-2.git \
+               git --bare init
 '
 
 test_expect_success 'reinit' '
 
        (
-               sane_unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
-
                mkdir again &&
                cd again &&
                git init >out1 2>err1 &&
@@ -214,21 +183,20 @@ test_expect_success 'init with --template (blank)' '
                cd template-plain &&
                git init
        ) &&
-       test -f template-plain/.git/info/exclude &&
+       test_path_is_file template-plain/.git/info/exclude &&
        (
                mkdir template-blank &&
                cd template-blank &&
                git init --template=
        ) &&
-       ! test -f template-blank/.git/info/exclude
+       test_path_is_missing template-blank/.git/info/exclude
 '
 
 test_expect_success 'init with init.templatedir set' '
        mkdir templatedir-source &&
        echo Content >templatedir-source/file &&
+       test_config_global init.templatedir "${HOME}/templatedir-source" &&
        (
-               test_config="${HOME}/.gitconfig" &&
-               git config -f "$test_config"  init.templatedir "${HOME}/templatedir-source" &&
                mkdir templatedir-set &&
                cd templatedir-set &&
                sane_unset GIT_TEMPLATE_DIR &&
@@ -240,10 +208,9 @@ 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 &&
        (
-               test_config="$HOME"/.gitconfig &&
-               git config -f "$test_config" core.bare false &&
-               git config -f "$test_config" core.sharedRepository 0640 &&
                mkdir init-bare-shared-override &&
                cd init-bare-shared-override &&
                git init --bare --shared=0666
@@ -254,9 +221,8 @@ test_expect_success 'init --bare/--shared overrides system/global config' '
 '
 
 test_expect_success 'init honors global core.sharedRepository' '
+       test_config_global core.sharedRepository 0666 &&
        (
-               test_config="$HOME"/.gitconfig &&
-               git config -f "$test_config" core.sharedRepository 0666 &&
                mkdir shared-honor-global &&
                cd shared-honor-global &&
                git init
@@ -278,7 +244,7 @@ test_expect_success 'init creates a new directory' '
        rm -fr newdir &&
        (
                git init newdir &&
-               test -d newdir/.git/refs
+               test_path_is_dir newdir/.git/refs
        )
 '
 
@@ -286,7 +252,7 @@ test_expect_success 'init creates a new bare directory' '
        rm -fr newdir &&
        (
                git init --bare newdir &&
-               test -d newdir/refs
+               test_path_is_dir newdir/refs
        )
 '
 
@@ -295,7 +261,7 @@ test_expect_success 'init recreates a directory' '
        (
                mkdir newdir &&
                git init newdir &&
-               test -d newdir/.git/refs
+               test_path_is_dir newdir/.git/refs
        )
 '
 
@@ -304,14 +270,14 @@ test_expect_success 'init recreates a new bare directory' '
        (
                mkdir newdir &&
                git init --bare newdir &&
-               test -d newdir/refs
+               test_path_is_dir newdir/refs
        )
 '
 
 test_expect_success 'init creates a new deep directory' '
        rm -fr newdir &&
        git init newdir/a/b/c &&
-       test -d newdir/a/b/c/.git/refs
+       test_path_is_dir newdir/a/b/c/.git/refs
 '
 
 test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shared)' '
@@ -321,7 +287,7 @@ test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shar
                # the repository itself should follow "shared"
                umask 002 &&
                git init --bare --shared=0660 newdir/a/b/c &&
-               test -d newdir/a/b/c/refs &&
+               test_path_is_dir newdir/a/b/c/refs &&
                ls -ld newdir/a newdir/a/b > lsab.out &&
                ! grep -v "^drwxrw[sx]r-x" lsab.out &&
                ls -ld newdir/a/b/c > lsc.out &&
@@ -334,7 +300,7 @@ test_expect_success 'init notices EEXIST (1)' '
        (
                >newdir &&
                test_must_fail git init newdir &&
-               test -f newdir
+               test_path_is_file newdir
        )
 '
 
@@ -344,7 +310,7 @@ test_expect_success 'init notices EEXIST (2)' '
                mkdir newdir &&
                >newdir/a
                test_must_fail git init newdir/a/b &&
-               test -f newdir/a
+               test_path_is_file newdir/a
        )
 '
 
@@ -360,15 +326,15 @@ test_expect_success POSIXPERM,SANITY 'init notices EPERM' '
 test_expect_success 'init creates a new bare directory with global --bare' '
        rm -rf newdir &&
        git --bare init newdir &&
-       test -d newdir/refs
+       test_path_is_dir newdir/refs
 '
 
 test_expect_success 'init prefers command line to GIT_DIR' '
        rm -rf newdir &&
        mkdir otherdir &&
        GIT_DIR=otherdir git --bare init newdir &&
-       test -d newdir/refs &&
-       ! test -d otherdir/refs
+       test_path_is_dir newdir/refs &&
+       test_path_is_missing otherdir/refs
 '
 
 test_expect_success 'init with separate gitdir' '
@@ -376,7 +342,7 @@ test_expect_success 'init with separate gitdir' '
        git init --separate-git-dir realgitdir newdir &&
        echo "gitdir: `pwd`/realgitdir" >expected &&
        test_cmp expected newdir/.git &&
-       test -d realgitdir/refs
+       test_path_is_dir realgitdir/refs
 '
 
 test_expect_success 're-init on .git file' '
@@ -390,8 +356,8 @@ test_expect_success 're-init to update git link' '
        ) &&
        echo "gitdir: `pwd`/surrealgitdir" >expected &&
        test_cmp expected newdir/.git &&
-       test -d surrealgitdir/refs &&
-       ! test -d realgitdir/refs
+       test_path_is_dir surrealgitdir/refs &&
+       test_path_is_missing realgitdir/refs
 '
 
 test_expect_success 're-init to move gitdir' '
@@ -403,7 +369,7 @@ test_expect_success 're-init to move gitdir' '
        ) &&
        echo "gitdir: `pwd`/realgitdir" >expected &&
        test_cmp expected newdir/.git &&
-       test -d realgitdir/refs
+       test_path_is_dir realgitdir/refs
 '
 
 test_expect_success SYMLINKS 're-init to move gitdir symlink' '
@@ -417,8 +383,8 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
        ) &&
        echo "gitdir: `pwd`/realgitdir" >expected &&
        test_cmp expected newdir/.git &&
-       test -d realgitdir/refs &&
-       ! test -d newdir/here
+       test_cmp expected newdir/here &&
+       test_path_is_dir realgitdir/refs
 '
 
 test_done