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

Merge branch 'home-bin'

Browse Source
This commit is contained in:
Johannes Schindelin
2016-03-29 10:26:44 +02:00
parent 991f736c96 bea6503a99
commit 1b8a0eabf8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ static void setup_environment(LPWSTR top_level_path, int full_path)
/* extend the PATH */
len = GetEnvironmentVariable(L"PATH", NULL, 0);
len = sizeof(WCHAR) * (len + 2 * MAX_PATH);
len = sizeof(WCHAR) * (len + 3 * MAX_PATH);
path2 = (LPWSTR)malloc(len);
wcscpy(path2, top_level_path);
if (!full_path)
@@ -97,9 +97,16 @@ static void setup_environment(LPWSTR top_level_path, int full_path)
PathAppend(path2, msystem_bin);
if (_waccess(path2, 0) != -1) {
/* We are in an MSys2-based setup */
int len2 = GetEnvironmentVariable(L"HOME", NULL, 0);
wcscat(path2, L";");
wcscat(path2, top_level_path);
PathAppend(path2, L"usr\\bin;");
if (len2 + 6 < MAX_PATH) {
GetEnvironmentVariable(L"HOME",
path2 + wcslen(path2), len2);
PathAppend(path2, L"bin;");
}
}
else {
/* Fall back to MSys1 paths */