Skip to content

Commit 4d0fe97

Browse files
committed
mingw: allow absolute paths without drive prefix
When specifying an absolute path without a drive prefix, we convert that path internally. Let's make sure that we handle that case properly, too ;-) This fixes the command git clone https://github.com/git-for-windows/git \G4W Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 09e4268 commit 4d0fe97

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

compat/mingw.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,11 +1165,19 @@ unsigned int sleep (unsigned int seconds)
11651165
char *mingw_mktemp(char *template)
11661166
{
11671167
wchar_t wtemplate[MAX_PATH];
1168+
int offset = 0;
1169+
11681170
if (xutftowcs_path(wtemplate, template) < 0)
11691171
return NULL;
1172+
1173+
if (is_dir_sep(template[0]) && !is_dir_sep(template[1]) &&
1174+
iswalpha(wtemplate[0]) && wtemplate[1] == L':') {
1175+
/* We have an absolute path missing the drive prefix */
1176+
offset = 2;
1177+
}
11701178
if (!_wmktemp(wtemplate))
11711179
return NULL;
1172-
if (xwcstoutf(template, wtemplate, strlen(template) + 1) < 0)
1180+
if (xwcstoutf(template, wtemplate + offset, strlen(template) + 1) < 0)
11731181
return NULL;
11741182
return template;
11751183
}

t/t5580-unc-paths.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ case "$UNCPATH" in
3232
;;
3333
esac
3434

35-
test_expect_failure 'clone into absolute path lacking a drive prefix' '
35+
test_expect_success 'clone into absolute path lacking a drive prefix' '
3636
USINGBACKSLASHES="$(echo "$WITHOUTDRIVE"/without-drive-prefix |
3737
tr / \\\\)" &&
3838
git clone . "$USINGBACKSLASHES" &&

0 commit comments

Comments
 (0)