Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78d7e87e86178b90a350714c0b287353a0de20b4..cc1253ccabf6afe0a3903f9f15177f73e8e33183 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -11,6 +11,7 @@ TZ=UTC
 export LANG LC_ALL PAGER TZ
 EDITOR=:
 VISUAL=:
+unset GIT_EDITOR
 unset AUTHOR_DATE
 unset AUTHOR_EMAIL
 unset AUTHOR_NAME