Skip to content

Commit 6b10434

Browse files
bmueller84dscho
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 f6cf8b3 commit 6b10434

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
@@ -1249,8 +1249,13 @@ char *mingw_getcwd(char *pointer, int len)
12491249
return NULL;
12501250
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
12511251
CloseHandle(hnd);
1252-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1253-
return NULL;
1252+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1253+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1254+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1255+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1256+
return NULL;
1257+
}
1258+
}
12541259
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
12551260
return NULL;
12561261
return pointer;

0 commit comments

Comments
 (0)