Skip to content

Commit b6250d4

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 1c12b51 commit b6250d4

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
@@ -1090,8 +1090,13 @@ char *mingw_getcwd(char *pointer, int len)
10901090
return NULL;
10911091
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
10921092
CloseHandle(hnd);
1093-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1094-
return NULL;
1093+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1094+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1095+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1096+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1097+
return NULL;
1098+
}
1099+
}
10951100
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
10961101
return NULL;
10971102
return pointer;

0 commit comments

Comments
 (0)