зеркало из https://github.com/microsoft/git.git
pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
Since (ae8d08242
pathspec: pass directory indicator to
match_pathspec_item()) the path matching logic has been able to cope
with submodules without needing to strip off a trailing slash if a path
refers to a submodule.
Since the stripping the trailing slash is no longer necessary, remove
the PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag. In addition, factor
out the logic which dies if a path decends into a submodule so that it
can still be used as a check after a pathspec struct has been
initialized.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
bdab972153
Коммит
c08397e3aa
|
@ -388,10 +388,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||
*/
|
||||
parse_pathspec(&pathspec, 0,
|
||||
PATHSPEC_PREFER_FULL |
|
||||
PATHSPEC_SYMLINK_LEADING_PATH |
|
||||
PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE,
|
||||
PATHSPEC_SYMLINK_LEADING_PATH,
|
||||
prefix, argv);
|
||||
|
||||
die_path_inside_submodule(&the_index, &pathspec);
|
||||
|
||||
if (add_new_files) {
|
||||
int baselen;
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include "quote.h"
|
||||
#include "pathspec.h"
|
||||
#include "parse-options.h"
|
||||
#include "submodule.h"
|
||||
|
||||
static int quiet, verbose, stdin_paths, show_non_matching, no_index;
|
||||
static const char * const check_ignore_usage[] = {
|
||||
|
@ -87,10 +88,11 @@ static int check_ignore(struct dir_struct *dir,
|
|||
parse_pathspec(&pathspec,
|
||||
PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
|
||||
PATHSPEC_SYMLINK_LEADING_PATH |
|
||||
PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE |
|
||||
PATHSPEC_KEEP_ORDER,
|
||||
prefix, argv);
|
||||
|
||||
die_path_inside_submodule(&the_index, &pathspec);
|
||||
|
||||
/*
|
||||
* look for pathspecs matching entries in the index, since these
|
||||
* should not be ignored, in order to be consistent with
|
||||
|
|
29
pathspec.c
29
pathspec.c
|
@ -398,32 +398,6 @@ static void strip_submodule_slash_cheap(struct pathspec_item *item)
|
|||
}
|
||||
}
|
||||
|
||||
static void strip_submodule_slash_expensive(struct pathspec_item *item)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < active_nr; i++) {
|
||||
struct cache_entry *ce = active_cache[i];
|
||||
int ce_len = ce_namelen(ce);
|
||||
|
||||
if (!S_ISGITLINK(ce->ce_mode))
|
||||
continue;
|
||||
|
||||
if (item->len <= ce_len || item->match[ce_len] != '/' ||
|
||||
memcmp(ce->name, item->match, ce_len))
|
||||
continue;
|
||||
|
||||
if (item->len == ce_len + 1) {
|
||||
/* strip trailing slash */
|
||||
item->len--;
|
||||
item->match[item->len] = '\0';
|
||||
} else {
|
||||
die(_("Pathspec '%s' is in submodule '%.*s'"),
|
||||
item->original, ce_len, ce->name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform the initialization of a pathspec_item based on a pathspec element.
|
||||
*/
|
||||
|
@ -499,9 +473,6 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
|
|||
if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP)
|
||||
strip_submodule_slash_cheap(item);
|
||||
|
||||
if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE)
|
||||
strip_submodule_slash_expensive(item);
|
||||
|
||||
if (magic & PATHSPEC_LITERAL) {
|
||||
item->nowildcard_len = item->len;
|
||||
} else {
|
||||
|
|
14
pathspec.h
14
pathspec.h
|
@ -62,23 +62,15 @@ struct pathspec {
|
|||
#define PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP (1<<3)
|
||||
/* die if a symlink is part of the given path's directory */
|
||||
#define PATHSPEC_SYMLINK_LEADING_PATH (1<<4)
|
||||
/*
|
||||
* This is like a combination of ..LEADING_PATH and .._SLASH_CHEAP
|
||||
* (but not the same): it strips the trailing slash if the given path
|
||||
* is a gitlink but also checks and dies if gitlink is part of the
|
||||
* leading path (i.e. the given path goes beyond a submodule). It's
|
||||
* safer than _SLASH_CHEAP and also more expensive.
|
||||
*/
|
||||
#define PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE (1<<5)
|
||||
#define PATHSPEC_PREFIX_ORIGIN (1<<6)
|
||||
#define PATHSPEC_KEEP_ORDER (1<<7)
|
||||
#define PATHSPEC_PREFIX_ORIGIN (1<<5)
|
||||
#define PATHSPEC_KEEP_ORDER (1<<6)
|
||||
/*
|
||||
* For the callers that just need pure paths from somewhere else, not
|
||||
* from command line. Global --*-pathspecs options are ignored. No
|
||||
* magic is parsed in each pathspec either. If PATHSPEC_LITERAL is
|
||||
* allowed, then it will automatically set for every pathspec.
|
||||
*/
|
||||
#define PATHSPEC_LITERAL_PATH (1<<8)
|
||||
#define PATHSPEC_LITERAL_PATH (1<<7)
|
||||
|
||||
extern void parse_pathspec(struct pathspec *pathspec,
|
||||
unsigned magic_mask,
|
||||
|
|
33
submodule.c
33
submodule.c
|
@ -312,6 +312,39 @@ void die_in_unpopulated_submodule(const struct index_state *istate,
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Dies if any paths in the provided pathspec descends into a submodule
|
||||
*/
|
||||
void die_path_inside_submodule(const struct index_state *istate,
|
||||
const struct pathspec *ps)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < istate->cache_nr; i++) {
|
||||
struct cache_entry *ce = istate->cache[i];
|
||||
int ce_len = ce_namelen(ce);
|
||||
|
||||
if (!S_ISGITLINK(ce->ce_mode))
|
||||
continue;
|
||||
|
||||
for (j = 0; j < ps->nr ; j++) {
|
||||
const struct pathspec_item *item = &ps->items[j];
|
||||
|
||||
if (item->len <= ce_len)
|
||||
continue;
|
||||
if (item->match[ce_len] != '/')
|
||||
continue;
|
||||
if (strncmp(ce->name, item->match, ce_len))
|
||||
continue;
|
||||
if (item->len == ce_len + 1)
|
||||
continue;
|
||||
|
||||
die(_("Pathspec '%s' is in submodule '%.*s'"),
|
||||
item->original, ce_len, ce->name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int parse_submodule_update_strategy(const char *value,
|
||||
struct submodule_update_strategy *dst)
|
||||
{
|
||||
|
|
|
@ -51,6 +51,8 @@ extern int is_submodule_initialized(const char *path);
|
|||
extern int is_submodule_populated_gently(const char *path, int *return_error_code);
|
||||
extern void die_in_unpopulated_submodule(const struct index_state *istate,
|
||||
const char *prefix);
|
||||
extern void die_path_inside_submodule(const struct index_state *istate,
|
||||
const struct pathspec *ps);
|
||||
extern int parse_submodule_update_strategy(const char *value,
|
||||
struct submodule_update_strategy *dst);
|
||||
extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
|
||||
|
|
Загрузка…
Ссылка в новой задаче