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>

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 4c865051e7dd3d27eee0e2666b4aaaaa46116d5c..ca85aae51ed1c528d1b93e7fea5f53ecb8095851 100755 (executable)
--- 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 &&
        (
 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 &&
                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 &&
        (
 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
                mkdir newdir &&
                cd newdir &&
                git --bare init

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 03c223708ebb428125dffb4a9ca273629936ff0c..24706ba4125c44f7c32539dc7bfcbb24f3371462 100755 (executable)
--- 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' '
        (
 
 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 &&
                test_must_fail git config --get --path path.home \
                        >result 2>msg &&
                git config --get --path path.normal >>result &&