Skip to content

Commit 0fb6250

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 7876cbc commit 0fb6250

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
@@ -1052,8 +1052,13 @@ char *mingw_getcwd(char *pointer, int len)
10521052
return NULL;
10531053
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
10541054
CloseHandle(hnd);
1055-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1056-
return NULL;
1055+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1056+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1057+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1058+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1059+
return NULL;
1060+
}
1061+
}
10571062
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
10581063
return NULL;
10591064
return pointer;

0 commit comments

Comments
 (0)