mirror of
https://github.com/git/git.git
synced 2026-03-03 12:57:59 +01:00
Merge branch 'ds/bundle-uri' into next
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
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user