Merge branch 'cn/maint-branch-with-bad' into maint

diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index eb8cc9523e682518464d26e9ec721508f99dfd04..f0022839c76ede4b5f135a7318b9c53ede4a944a 100755 (executable)
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -25,7 +25,7 @@ test_expect_success 'P4CONFIG and absolute dir clone' '
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
-               unset P4PORT P4CLIENT &&
+               sane_unset P4PORT P4CLIENT &&
                "$GITP4" clone --verbose --dest="$git" //depot
        )
 '
@@ -37,7 +37,7 @@ test_expect_success 'P4CONFIG and relative dir clone' '
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
-               unset P4PORT P4CLIENT &&
+               sane_unset P4PORT P4CLIENT &&
                "$GITP4" clone --verbose --dest="git" //depot
        )
 '