Skip to content

Commit d6009dc

Browse files
bmueller84Git for Windows Build Agent
authored andcommitted
mingw: fix fatal error working on mapped network drives on Windows
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was introduced that causes git for Windows to stop working with certain mapped network drives (in particular, drives that are mapped to locations with long path names). Error message was "fatal: Unable to read current working directory: No such file or directory". Present change fixes this issue as discussed in #2480 Signed-off-by: Bjoern Mueller <[email protected]>
1 parent 0903998 commit d6009dc

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

compat/mingw.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,8 +1065,13 @@ char *mingw_getcwd(char *pointer, int len)
10651065
return NULL;
10661066
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
10671067
CloseHandle(hnd);
1068-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1069-
return NULL;
1068+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1069+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1070+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1071+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1072+
return NULL;
1073+
}
1074+
}
10701075
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
10711076
return NULL;
10721077
return pointer;

0 commit comments

Comments
 (0)