aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-09 14:20:58 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-09 14:20:58 -0800
commite1c192d387ef27b3cf297688625d3f49e0068563 (patch)
treecf9b831fcecfde943829b3292b3cc8545693c7a4
parent38062e73e009f27ea192d50481fcb5e7b0e9d6eb (diff)
parent944d808e42817d48bea480c135bc9d3efd53d4e7 (diff)
downloadgit-e1c192d387ef27b3cf297688625d3f49e0068563.tar.gz
Merge branch 'js/test-unset-trace2-parents'
Avoid tests that are run under GIT_TRACE2 set from failing unnecessarily. * js/test-unset-trace2-parents: test-lib: unset trace2 parent envvars
-rw-r--r--t/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0f7a137c7d..e4716b0b86 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -449,6 +449,8 @@ unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
unset XDG_CACHE_HOME
unset XDG_CONFIG_HOME
unset GITPERLLIB
+unset GIT_TRACE2_PARENT_NAME
+unset GIT_TRACE2_PARENT_SID
TEST_AUTHOR_LOCALNAME=author
TEST_AUTHOR_DOMAIN=example.com
GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}