Skip to content

Commit d9ee6f1

Browse files
bmueller84mjcheetham
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 69cd08b commit d9ee6f1

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
@@ -1143,8 +1143,13 @@ char *mingw_getcwd(char *pointer, int len)
11431143
return NULL;
11441144
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
11451145
CloseHandle(hnd);
1146-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1147-
return NULL;
1146+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1147+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1148+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1149+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1150+
return NULL;
1151+
}
1152+
}
11481153
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
11491154
return NULL;
11501155
return pointer;

0 commit comments

Comments
 (0)