Ideally, each test should be responsible for setting up state it needs
rather than relying upon transient global state. Toward this end, teach
test_rev_parse() to accept a "-b <value>" option to allow callers to set
"core.bare" explicitly or undefine it, and take advantage of this new
option to avoid setting "core.bare" outside of tests.
Under the hood, "-b <value>" invokes "test_config -C <dir>" (or
"test_unconfig -C <dir>"), which means that git-config knows explicitly
where to find its configuration file. Consequently, the global
GIT_CONFIG environment variable, which was needed by the manual
git-config invocations outside of tests, is no longer needed, and is
thus dropped.
Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com>
---
t/t1500-rev-parse.sh | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index f294ecc..c058aa4 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -6,15 +6,25 @@ test_description='test git rev-parse'
# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir
test_rev_parse () {
dir=
+ bare=
while :
do
case "$1" in
-C) dir="-C $2"; shift; shift ;;
+ -b) bare="$2"; shift; shift ;;
-*) error "test_rev_parse: unrecognized option '$1'" ;;
*) break ;;
esac
done
+ case "$bare" in
+ '') ;;
+ t*) bare="test_config $dir core.bare true" ;;
+ f*) bare="test_config $dir core.bare false" ;;
+ u*) bare="test_unconfig $dir core.bare" ;;
+ *) error "test_rev_parse: unrecognized core.bare value '$bare'"
+ esac
+
name=$1
shift
@@ -26,6 +36,7 @@ test_rev_parse () {
do
expect="$1"
test_expect_success "$name: $o" '
+ $bare &&
echo "$expect" >expect &&
git $dir rev-parse --$o >actual &&
test_cmp expect actual
@@ -45,37 +56,27 @@ test_rev_parse -C .git/objects .git/objects/ false true
false '' "$ROOT/.git"
test_expect_success 'setup untracked sub/dir' 'mkdir -p sub/dir'
test_rev_parse -C sub/dir subdirectory false false true sub/dir/ "$ROOT/.git"
-git config core.bare true
-test_rev_parse 'core.bare = true' true false false
+test_rev_parse -b t 'core.bare = true' true false false
-git config --unset core.bare
-test_rev_parse 'core.bare undefined' false false true
+test_rev_parse -b u 'core.bare undefined' false false true
test_expect_success 'setup non-local database ../.git' 'mkdir work'
GIT_DIR=../.git
-GIT_CONFIG="$ROOT/work/../.git/config"
-export GIT_DIR GIT_CONFIG
+export GIT_DIR
-git config core.bare false
-test_rev_parse -C work 'GIT_DIR=../.git, core.bare = false' false false true ''
+test_rev_parse -C work -b f 'GIT_DIR=../.git, core.bare = false' false false
true ''
-git config core.bare true
-test_rev_parse -C work 'GIT_DIR=../.git, core.bare = true' true false false ''
+test_rev_parse -C work -b t 'GIT_DIR=../.git, core.bare = true' true false
false ''
-git config --unset core.bare
-test_rev_parse -C work 'GIT_DIR=../.git, core.bare undefined' false false true
''
+test_rev_parse -C work -b u 'GIT_DIR=../.git, core.bare undefined' false false
true ''
test_expect_success 'setup non-local database ../repo.git' 'mv .git repo.git'
GIT_DIR=../repo.git
-GIT_CONFIG="$ROOT/work/../repo.git/config"
-git config core.bare false
-test_rev_parse -C work 'GIT_DIR=../repo.git, core.bare = false' false false
true ''
+test_rev_parse -C work -b f 'GIT_DIR=../repo.git, core.bare = false' false
false true ''
-git config core.bare true
-test_rev_parse -C work 'GIT_DIR=../repo.git, core.bare = true' true false
false ''
+test_rev_parse -C work -b t 'GIT_DIR=../repo.git, core.bare = true' true false
false ''
-git config --unset core.bare
-test_rev_parse -C work 'GIT_DIR=../repo.git, core.bare undefined' false false
true ''
+test_rev_parse -C work -b u 'GIT_DIR=../repo.git, core.bare undefined' false
false true ''
test_done
--
2.8.2.530.g51d527d
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
