diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:23:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 12:38:04 -0700 |
| commit | ed6c994af407dd2bea110460657222e39a7d83ad (patch) | |
| tree | 8b21a757e09a53b572e01aad98d260a98afca0c5 | |
| parent | 0590ff26c406204281262c2753b3b92aa07f59c7 (diff) | |
| download | git-ed6c994af407dd2bea110460657222e39a7d83ad.tar.xz | |
t: use sane_unset() rather than 'unset' with broken &&-chain
These tests intentionally break the &&-chain after using 'unset' since
they don't know if 'unset' will succeed or fail and don't want a local
'unset' failure to fail the test overall. We can do better by using
sane_unset(), which can be linked into the &&-chain as usual.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0001-init.sh | 4 | ||||
| -rwxr-xr-x | t/t1300-config.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 4c865051e7..ca85aae51e 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -408,7 +408,7 @@ is_hidden () { test_expect_success MINGW '.git hidden' ' rm -rf newdir && ( - unset GIT_DIR GIT_WORK_TREE + sane_unset GIT_DIR GIT_WORK_TREE && mkdir newdir && cd newdir && git init && @@ -420,7 +420,7 @@ test_expect_success MINGW '.git hidden' ' test_expect_success MINGW 'bare git dir not hidden' ' rm -rf newdir && ( - unset GIT_DIR GIT_WORK_TREE GIT_CONFIG + sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG && mkdir newdir && cd newdir && git --bare init diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 03c223708e..24706ba412 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -888,7 +888,7 @@ EOF test_expect_success !MINGW 'get --path copes with unset $HOME' ' ( - unset HOME; + sane_unset HOME && test_must_fail git config --get --path path.home \ >result 2>msg && git config --get --path path.normal >>result && |