diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2018-12-15 05:33:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-27 00:26:17 +0100 |
| commit | 1cadad6f658bfb3ab54b25dd04bac372253473b6 (patch) | |
| tree | 78a76cdc3a651aeef35138b750c43beea1f8154a /git-compat-util.h | |
| parent | Git 2.19.2 (diff) | |
| download | git-1cadad6f658bfb3ab54b25dd04bac372253473b6.tar.xz git-1cadad6f658bfb3ab54b25dd04bac372253473b6.zip | |
git clone <url> C:\cygwin\home\USER\repo' is working (again)
A regression for cygwin users was introduced with commit 05b458c,
"real_path: resolve symlinks by hand".
In the the commit message we read:
The current implementation of real_path uses chdir() in order to resolve
symlinks. Unfortunately this isn't thread-safe as chdir() affects a
process as a whole...
The old (and non-thread-save) OS calls chdir()/pwd() had been
replaced by a string operation.
The cygwin layer "knows" that "C:\cygwin" is an absolute path,
but the new string operation does not.
"git clone <url> C:\cygwin\home\USER\repo" fails like this:
fatal: Invalid path '/home/USER/repo/C:\cygwin\home\USER\repo'
The solution is to implement has_dos_drive_prefix(), skip_dos_drive_prefix()
is_dir_sep(), offset_1st_component() and convert_slashes() for cygwin
in the same way as it is done in 'Git for Windows' in compat/mingw.[ch]
Extract the needed code into compat/win32/path-utils.[ch] and use it
for cygwin as well.
Reported-by: Steven Penny <svnpenn@gmail.com>
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 5f2e90932f..925a8ae72b 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -190,10 +190,11 @@ #endif #if defined(__CYGWIN__) -#include "compat/cygwin.h" +#include "compat/win32/path-utils.h" #endif #if defined(__MINGW32__) /* pull in Windows compatibility stuff */ +#include "compat/win32/path-utils.h" #include "compat/mingw.h" #elif defined(_MSC_VER) #include "compat/msvc.h" |