Merge branch 'mo/perl-bidi-pipe-envfix'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 42f2f144969a0671b3431f21f659beaff2c53b3d..0fdc541a7cd7d6b694c4f4a3fd06b6cf21dc7380 100644 (file)
--- 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