Skip to content

Commit 09d7dec

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 b48c1c1 commit 09d7dec

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
@@ -1225,8 +1225,13 @@ char *mingw_getcwd(char *pointer, int len)
12251225
return NULL;
12261226
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
12271227
CloseHandle(hnd);
1228-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1229-
return NULL;
1228+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1229+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1230+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1231+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1232+
return NULL;
1233+
}
1234+
}
12301235
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
12311236
return NULL;
12321237
return pointer;

0 commit comments

Comments
 (0)