Skip to content

Commit 3aea1a5

Browse files
j6tgitster
authored andcommitted
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>
1 parent 78360b5 commit 3aea1a5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compat/mingw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static const char *quote_arg(const char *arg)
457457
const char *p = arg;
458458
if (!*p) force_quotes = 1;
459459
while (*p) {
460-
if (isspace(*p) || *p == '*' || *p == '?' || *p == '{')
460+
if (isspace(*p) || *p == '*' || *p == '?' || *p == '{' || *p == '\'')
461461
force_quotes = 1;
462462
else if (*p == '"')
463463
n++;

0 commit comments

Comments
 (0)