global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-01 05:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-wrapper: support git.exe and gitk.exe to be in a spaced dir

Browse Source 
When *Git for Windows* is installed into a directory that has spaces in
it, e.g. `C:\Program Files\Git`, the `git-wrapper` appends this directory
unquoted when fixing up the command line. To resolve this, just quote the
provided `execpath`.

Signed-off-by: nalla <nalla@hamal.uberspace.de>
This commit is contained in:
nalla
2015-03-30 15:10:38 +01:00
committed by Johannes Schindelin
parent a5c3577232
commit 2863b0b499
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/win32/git-wrapper.c
View File

@@ -133,7 +133,7 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait,
(wcslen(cmdline) + prefix_args_len + 1 + MAX_PATH));
if (prefix_args) {
if (is_git_command)
_swprintf(cmd, L"%s\\%s %.*s", exepath, L"git.exe",
_swprintf(cmd, L"\"%s\\%s\" %.*s", exepath, L"git.exe",
prefix_args_len, prefix_args);
else
_swprintf(cmd, L"%.*s", prefix_args_len, prefix_args);
@@ -343,7 +343,7 @@ int main(void)
/* set the default exe module */
wcscpy(exe, exepath);
wcscpy(buffer, exepath);
swprintf(buffer, BUFSIZE, L"\"%s\"", exepath);
PathAppend(exe, msystem_bin);
PathAppend(exe, L"wish.exe");
if (_waccess(exe, 0) != -1)