From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 31 Oct 2009 01:24:04 +0000 (-0500)
Subject: Handle more shell metacharacters in editor names
X-Git-Tag: v1.6.6-rc0~24^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eab58f1e8e5ef86b5075ce6dfcd6d3f1b3b888b3;p=git.git

Handle more shell metacharacters in editor names

Pass the editor name to the shell if it contains any susv3 shell
special character (globs, redirections, variable substitutions,
escapes, etc).  This way, the meaning of some characters will not
meaninglessly change when others are added, and git commands
implemented in C and in shell scripts will interpret editor names
in the same way.

This does not make the GIT_EDITOR setting any more expressive,
since one could always use single quotes to force the editor to
be passed to the shell.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/editor.c b/editor.c
index 4d469d076..941c0b2ab 100644
--- a/editor.c
+++ b/editor.c
@@ -28,7 +28,7 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
 		const char *args[6];
 		struct strbuf arg0 = STRBUF_INIT;
 
-		if (strcspn(editor, "$ \t'") != len) {
+		if (strcspn(editor, "|&;<>()$`\\\"' \t\n*?[#~=%") != len) {
 			/* there are specials */
 			strbuf_addf(&arg0, "%s \"$@\"", editor);
 			args[i++] = "sh";