diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-03 21:30:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-03 21:30:34 (GMT) |
| commit | b3b2ddced295c26134568cf879488a921a352865 (patch) | |
| tree | 2933bae2dd17545280f0bdcf38eca1e03d93d3bf /compat | |
| parent | 83937e9592832408670da38bfe6e96c90ad63521 (diff) | |
| parent | 89c6e450fe4a919ecb6fa698005a935531c732cf (diff) | |
| download | git-b3b2ddced295c26134568cf879488a921a352865.zip git-b3b2ddced295c26134568cf879488a921a352865.tar.gz git-b3b2ddced295c26134568cf879488a921a352865.tar.bz2 | |
Merge branch 'ds/bundle-uri'
Preliminary code refactoring around transport and bundle code.
* ds/bundle-uri:
bundle.h: make "fd" version of read_bundle_header() public
remote: allow relative_url() to return an absolute url
remote: move relative_url()
http: make http_get_file() external
fetch-pack: move --keep=* option filling to a function
fetch-pack: add a deref_without_lazy_fetch_extended()
dir API: add a generalized path_match_flags() function
connect.c: refactor sending of agent & object-format
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 2 | ||||
| -rw-r--r-- | compat/win32/path-utils.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 5772692..2607de9 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2830,7 +2830,7 @@ not_a_reserved_name: } c = path[i]; - if (c && c != '.' && c != ':' && c != '/' && c != '\\') + if (c && c != '.' && c != ':' && !is_xplatform_dir_sep(c)) goto not_a_reserved_name; /* contains reserved name */ diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h index bba2b64..65fa3b9 100644 --- a/compat/win32/path-utils.h +++ b/compat/win32/path-utils.h @@ -6,11 +6,7 @@ int win32_has_dos_drive_prefix(const char *path); int win32_skip_dos_drive_prefix(char **path); #define skip_dos_drive_prefix win32_skip_dos_drive_prefix -static inline int win32_is_dir_sep(int c) -{ - return c == '/' || c == '\\'; -} -#define is_dir_sep win32_is_dir_sep +#define is_dir_sep is_xplatform_dir_sep static inline char *win32_find_last_dir_sep(const char *path) { char *ret = NULL; |