diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-02 15:05:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-02 15:05:58 +0900 |
| commit | 7d26aa32309a2a5979c4ae4b85b25b20e8aae0d4 (patch) | |
| tree | d04eae1e3b22448ecac24085db96419c53ddca77 /compat | |
| parent | Fourth batch for 2.14 (diff) | |
| parent | Windows: do not treat a path with backslashes as a remote's nick name (diff) | |
| download | tgif-7d26aa32309a2a5979c4ae4b85b25b20e8aae0d4.tar.xz | |
Merge branch 'js/bs-is-a-dir-sep-on-windows'
"foo\bar\baz" in "git fetch foo\bar\baz", even though there is no
slashes in it, cannot be a nickname for a remote on Windows, as
that is likely to be a pathname on a local filesystem.
* js/bs-is-a-dir-sep-on-windows:
Windows: do not treat a path with backslashes as a remote's nick name
mingw.h: permit arguments with side effects for is_dir_sep
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 3350169555..e03aecfe2e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -398,7 +398,11 @@ HANDLE winansi_get_osfhandle(int fd); (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0) int mingw_skip_dos_drive_prefix(char **path); #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix -#define is_dir_sep(c) ((c) == '/' || (c) == '\\') +static inline int mingw_is_dir_sep(int c) +{ + return c == '/' || c == '\\'; +} +#define is_dir_sep mingw_is_dir_sep static inline char *mingw_find_last_dir_sep(const char *path) { char *ret = NULL; |