Merge branch 'maint-1.5.4' into maint

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 6a74b3acfda6774d7996cf5787e9858654357328..2d919d69ef110408b820c76185d6b8da63ea183e 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -4,8 +4,6 @@ test_description='GIT_EDITOR, core.editor, and stuff'
 
 . ./test-lib.sh
 
-OLD_TERM="$TERM"
-
 for i in GIT_EDITOR core_editor EDITOR VISUAL vi
 do
        cat >e-$i.sh <<-EOF
@@ -116,6 +114,4 @@ test_expect_success 'core.editor with a space' '
 
 '
 
-TERM="$OLD_TERM"
-
 test_done