summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-01-26 15:33:32 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-27 10:24:05 -0800
commita1231de0020b60076f946012b8230db9b1c00cfd (patch)
treea3ed7cdcbd6f606a271d86f47699bd994b41b384
parentMerge branch 'jn/fast-import-empty-tree-removal' into maint (diff)
downloadtgif-a1231de0020b60076f946012b8230db9b1c00cfd.tar.xz
tests: sanitize more git environment variables
These variables should generally not be set in one's environment, but they do get set by rebase, which means doing an interactive rebase like: pick abcd1234 foo exec make test will cause false negatives in the test suite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1fb76abd14..7ffd7d36ad 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -70,6 +70,9 @@ unset GIT_NOTES_REF
unset GIT_NOTES_DISPLAY_REF
unset GIT_NOTES_REWRITE_REF
unset GIT_NOTES_REWRITE_MODE
+unset GIT_REFLOG_ACTION
+unset GIT_CHERRY_PICK_HELP
+unset GIT_QUIET
GIT_MERGE_VERBOSITY=5
export GIT_MERGE_VERBOSITY
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME