diff options
| author | Jeff King <peff@peff.net> | 2014-03-20 19:18:12 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-21 14:28:03 -0700 |
| commit | 2a472410cbb481c56ee207dbda2ee99d158c0f48 (patch) | |
| tree | aa0cc876e24ec976b836792a8d555ad9c26c3545 | |
| parent | 633734d4a13ace930b34c83d37b4e8a22ccf5a3b (diff) | |
| download | git-2a472410cbb481c56ee207dbda2ee99d158c0f48.tar.gz | |
t0001: use test_config_global
We hand-set several config options using :
git config -f $HOME/.gitconfig ...
Instead, we can use "test_config_global". Not only is this
more readable, but it cleans up for us so that subsequent
tests aren't polluted by our settings.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0001-init.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index fdcf4b3ba5..9515da3024 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -211,9 +211,8 @@ test_expect_success 'init with --template (blank)' ' 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 && @@ -225,10 +224,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 @@ -239,9 +237,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 |