summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-03-24 20:43:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-24 21:42:59 (GMT)
commit3aea1a5a899f5ff34f12d0cd6d8e903ddcfeef3a (patch)
treedfb39c48a6ebb00657d4ac42ec3adb36345e39f7 /compat
parent78360b576acb0ee47c90552cb3f976a3c6ba4d6a (diff)
downloadgit-3aea1a5a899f5ff34f12d0cd6d8e903ddcfeef3a.zip
git-3aea1a5a899f5ff34f12d0cd6d8e903ddcfeef3a.tar.gz
git-3aea1a5a899f5ff34f12d0cd6d8e903ddcfeef3a.tar.bz2
MinGW: Quote arguments for subprocesses that contain a single-quote
Before a process can be spawned by mingw_spawnve, arguments must be surrounded by double-quotes if special characters are present. This is necessary because the startup code of the spawned process will expand arguments that look like glob patterns. "Normal" Windows command line utilities expand only * and ?, but MSYS programs, including bash, are different: They also expand braces, and this has already been taken care of by compat/mingw.c:quote_arg(). But MSYS programs also treat single-quotes in a special way: Arguments between single-quotes are spliced together (with spaces) into a word. With this patch this treatment is avoided by quoting arguments that contain single-quotes. This lets t4252 pass on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 171fa85..2839d9d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -457,7 +457,7 @@ static const char *quote_arg(const char *arg)
const char *p = arg;
if (!*p) force_quotes = 1;
while (*p) {
- if (isspace(*p) || *p == '*' || *p == '?' || *p == '{')
+ if (isspace(*p) || *p == '*' || *p == '?' || *p == '{' || *p == '\'')
force_quotes = 1;
else if (*p == '"')
n++;