Merge branch 'maint'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index b61e1d598de606a496cbc93345600bf8b380f426..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
@@ -233,7 +234,7 @@ test_create_repo () {
        mv .git/hooks .git/hooks-disabled
        cd "$owd"
 }
-       
+
 test_done () {
        trap - exit
        case "$test_failure" in