Merge branch 'maint-1.7.2' into maint-1.7.3

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1fb76abd14e358afb42774f0ffe1d4e70b749074..7ffd7d36ade0520438fda3e2a1d39716b6f594d3 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