t: drop useless sane_unset GIT_* calls
Several test scripts manually unset GIT_CONFIG and other GIT_* variables. These are generally taken care of for us by test-lib.sh already. Unsetting these is not only useless, but can be confusing to a reader, who may wonder why some tests in a script unset them and others do not (t0001 is particularly guilty of this inconsistency, probably because many of its tests predate the test-lib.sh environment-cleansing). Note that we cannot always get rid of such unsetting. For example, t9130 can drop the GIT_CONFIG unset, but not the GIT_DIR one, because lib-git-svn.sh sets the latter. And in t1000, we unset GIT_TEMPLATE_DIR, which is explicitly initialized by test-lib.sh. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
35de3ac1db
commit
221bf98506
|
@ -25,7 +25,6 @@ check_config () {
|
||||||
|
|
||||||
test_expect_success 'plain' '
|
test_expect_success 'plain' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
||||||
mkdir plain &&
|
mkdir plain &&
|
||||||
cd plain &&
|
cd plain &&
|
||||||
git init
|
git init
|
||||||
|
@ -35,7 +34,6 @@ test_expect_success 'plain' '
|
||||||
|
|
||||||
test_expect_success 'plain nested in bare' '
|
test_expect_success 'plain nested in bare' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
||||||
git init --bare bare-ancestor.git &&
|
git init --bare bare-ancestor.git &&
|
||||||
cd bare-ancestor.git &&
|
cd bare-ancestor.git &&
|
||||||
mkdir plain-nested &&
|
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' '
|
test_expect_success 'plain through aliased command, outside any git repo' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
||||||
HOME=$(pwd)/alias-config &&
|
HOME=$(pwd)/alias-config &&
|
||||||
export HOME &&
|
export HOME &&
|
||||||
mkdir alias-config &&
|
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' '
|
test_expect_failure 'plain nested through aliased command' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
||||||
git init plain-ancestor-aliased &&
|
git init plain-ancestor-aliased &&
|
||||||
cd plain-ancestor-aliased &&
|
cd plain-ancestor-aliased &&
|
||||||
echo "[alias] aliasedinit = init" >>.git/config &&
|
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' '
|
test_expect_failure 'plain nested in bare through aliased command' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
||||||
git init --bare bare-ancestor-aliased.git &&
|
git init --bare bare-ancestor-aliased.git &&
|
||||||
cd bare-ancestor-aliased.git &&
|
cd bare-ancestor-aliased.git &&
|
||||||
echo "[alias] aliasedinit = init" >>config &&
|
echo "[alias] aliasedinit = init" >>config &&
|
||||||
|
@ -91,7 +86,6 @@ test_expect_failure 'plain nested in bare through aliased command' '
|
||||||
|
|
||||||
test_expect_success 'plain with GIT_WORK_TREE' '
|
test_expect_success 'plain with GIT_WORK_TREE' '
|
||||||
if (
|
if (
|
||||||
sane_unset GIT_DIR &&
|
|
||||||
mkdir plain-wt &&
|
mkdir plain-wt &&
|
||||||
cd plain-wt &&
|
cd plain-wt &&
|
||||||
GIT_WORK_TREE=$(pwd) git init
|
GIT_WORK_TREE=$(pwd) git init
|
||||||
|
@ -104,7 +98,6 @@ test_expect_success 'plain with GIT_WORK_TREE' '
|
||||||
|
|
||||||
test_expect_success 'plain bare' '
|
test_expect_success 'plain bare' '
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
|
|
||||||
mkdir plain-bare-1 &&
|
mkdir plain-bare-1 &&
|
||||||
cd plain-bare-1 &&
|
cd plain-bare-1 &&
|
||||||
git --bare init
|
git --bare init
|
||||||
|
@ -114,7 +107,6 @@ test_expect_success 'plain bare' '
|
||||||
|
|
||||||
test_expect_success 'plain bare with GIT_WORK_TREE' '
|
test_expect_success 'plain bare with GIT_WORK_TREE' '
|
||||||
if (
|
if (
|
||||||
sane_unset GIT_DIR GIT_CONFIG &&
|
|
||||||
mkdir plain-bare-2 &&
|
mkdir plain-bare-2 &&
|
||||||
cd plain-bare-2 &&
|
cd plain-bare-2 &&
|
||||||
GIT_WORK_TREE=$(pwd) git --bare init
|
GIT_WORK_TREE=$(pwd) git --bare init
|
||||||
|
@ -128,7 +120,6 @@ test_expect_success 'plain bare with GIT_WORK_TREE' '
|
||||||
test_expect_success 'GIT_DIR bare' '
|
test_expect_success 'GIT_DIR bare' '
|
||||||
|
|
||||||
(
|
(
|
||||||
sane_unset GIT_CONFIG &&
|
|
||||||
mkdir git-dir-bare.git &&
|
mkdir git-dir-bare.git &&
|
||||||
GIT_DIR=git-dir-bare.git git init
|
GIT_DIR=git-dir-bare.git git init
|
||||||
) &&
|
) &&
|
||||||
|
@ -138,7 +129,6 @@ test_expect_success 'GIT_DIR bare' '
|
||||||
test_expect_success 'init --bare' '
|
test_expect_success 'init --bare' '
|
||||||
|
|
||||||
(
|
(
|
||||||
sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
|
|
||||||
mkdir init-bare.git &&
|
mkdir init-bare.git &&
|
||||||
cd init-bare.git &&
|
cd init-bare.git &&
|
||||||
git init --bare
|
git init --bare
|
||||||
|
@ -149,7 +139,6 @@ test_expect_success 'init --bare' '
|
||||||
test_expect_success 'GIT_DIR non-bare' '
|
test_expect_success 'GIT_DIR non-bare' '
|
||||||
|
|
||||||
(
|
(
|
||||||
sane_unset GIT_CONFIG &&
|
|
||||||
mkdir non-bare &&
|
mkdir non-bare &&
|
||||||
cd non-bare &&
|
cd non-bare &&
|
||||||
GIT_DIR=.git git init
|
GIT_DIR=.git git init
|
||||||
|
@ -160,7 +149,6 @@ test_expect_success 'GIT_DIR non-bare' '
|
||||||
test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
|
test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
|
||||||
|
|
||||||
(
|
(
|
||||||
sane_unset GIT_CONFIG &&
|
|
||||||
mkdir git-dir-wt-1.git &&
|
mkdir git-dir-wt-1.git &&
|
||||||
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
|
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
|
||||||
) &&
|
) &&
|
||||||
|
@ -170,7 +158,6 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
|
||||||
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
||||||
|
|
||||||
if (
|
if (
|
||||||
sane_unset GIT_CONFIG &&
|
|
||||||
mkdir git-dir-wt-2.git &&
|
mkdir git-dir-wt-2.git &&
|
||||||
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init
|
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init
|
||||||
)
|
)
|
||||||
|
@ -183,8 +170,6 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
||||||
test_expect_success 'reinit' '
|
test_expect_success 'reinit' '
|
||||||
|
|
||||||
(
|
(
|
||||||
sane_unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
|
|
||||||
|
|
||||||
mkdir again &&
|
mkdir again &&
|
||||||
cd again &&
|
cd again &&
|
||||||
git init >out1 2>err1 &&
|
git init >out1 2>err1 &&
|
||||||
|
|
|
@ -97,7 +97,6 @@ test_expect_success 'fresh clone with svn.authors-file in config' '
|
||||||
test x = x"$(git config svn.authorsfile)" &&
|
test x = x"$(git config svn.authorsfile)" &&
|
||||||
test_config="$HOME"/.gitconfig &&
|
test_config="$HOME"/.gitconfig &&
|
||||||
sane_unset GIT_DIR &&
|
sane_unset GIT_DIR &&
|
||||||
sane_unset GIT_CONFIG &&
|
|
||||||
git config --global \
|
git config --global \
|
||||||
svn.authorsfile "$HOME"/svn-authors &&
|
svn.authorsfile "$HOME"/svn-authors &&
|
||||||
test x"$HOME"/svn-authors = x"$(git config svn.authorsfile)" &&
|
test x"$HOME"/svn-authors = x"$(git config svn.authorsfile)" &&
|
||||||
|
|
|
@ -25,7 +25,6 @@ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
|
||||||
test_done
|
test_done
|
||||||
}
|
}
|
||||||
|
|
||||||
unset GIT_DIR GIT_CONFIG
|
|
||||||
WORKDIR=$(pwd)
|
WORKDIR=$(pwd)
|
||||||
SERVERDIR=$(pwd)/gitcvs.git
|
SERVERDIR=$(pwd)/gitcvs.git
|
||||||
git_config="$SERVERDIR/config"
|
git_config="$SERVERDIR/config"
|
||||||
|
|
Loading…
Reference in New Issue