Skip to content

Commit a701953

Browse files
bmueller84Git for Windows Build Agent
authored and
Git for Windows Build Agent
committed
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 252d53b commit a701953

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
@@ -1272,8 +1272,13 @@ char *mingw_getcwd(char *pointer, int len)
12721272
if (hnd != INVALID_HANDLE_VALUE) {
12731273
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
12741274
CloseHandle(hnd);
1275-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1276-
return NULL;
1275+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1276+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1277+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1278+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1279+
return NULL;
1280+
}
1281+
}
12771282
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
12781283
return NULL;
12791284
return pointer;

0 commit comments

Comments
 (0)