X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7005-editor.sh;h=2d919d69ef110408b820c76185d6b8da63ea183e;hb=8c4021abfd170278d1a3431e2777bedd0c01fbb1;hp=44228b5ac12f5df9d6def93dc74e3687ba2d8e73;hpb=c4316674c48708ca62876470c615101ab8fee2e0;p=git.git

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 44228b5ac..2d919d69e 100755
--- 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
@@ -37,7 +35,7 @@ test_expect_success 'dumb should error out when falling back on vi' '
 	if git commit --amend
 	then
 		echo "Oops?"
-		exit 1
+		false
 	else
 		: happy
 	fi
@@ -89,6 +87,31 @@ do
 	'
 done
 
-TERM="$OLD_TERM"
+test_expect_success 'editor with a space' '
+
+	if echo "echo space > \"\$1\"" > "e space.sh"
+	then
+		chmod a+x "e space.sh" &&
+		GIT_EDITOR="./e\ space.sh" git commit --amend &&
+		test space = "$(git show -s --pretty=format:%s)"
+	else
+		say "Skipping; FS does not support spaces in filenames"
+	fi
+
+'
+
+unset GIT_EDITOR
+test_expect_success 'core.editor with a space' '
+
+	if test -f "e space.sh"
+	then
+		git config core.editor \"./e\ space.sh\" &&
+		git commit --amend &&
+		test space = "$(git show -s --pretty=format:%s)"
+	else
+		say "Skipping; FS does not support spaces in filenames"
+	fi
+
+'
 
 test_done