kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP 

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 stripping the slash is no longer necessary, remove the
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP flag.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2017-05-11 15:04:26 -07:00 committed by Junio C Hamano
parent cbca060e10
commit 2249d4dbc1
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/reset.c
View File

@ -236,7 +236,6 @@ static void parse_args(struct pathspec *pathspec,


parse_pathspec(pathspec, 0, parse_pathspec(pathspec, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFER_FULL |
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP |
(patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0), (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
prefix, argv); prefix, argv);
} }

3
builtin/rm.c
View File

@ -271,8 +271,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
die(_("index file corrupt")); die(_("index file corrupt"));


parse_pathspec(&pathspec, 0, parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD | PATHSPEC_PREFER_CWD,
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
prefix, argv); prefix, argv);
refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL); refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);



3
builtin/submodule--helper.c
View File

@ -233,8 +233,7 @@ static int module_list_compute(int argc, const char **argv,
int i, result = 0; int i, result = 0;
char *ps_matched = NULL; char *ps_matched = NULL;
parse_pathspec(pathspec, 0, parse_pathspec(pathspec, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFER_FULL,
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
prefix, argv); prefix, argv);


if (pathspec->nr) if (pathspec->nr)

15
pathspec.c
View File

@ -386,18 +386,6 @@ static const char *parse_element_magic(unsigned *magic, int *prefix_len,
return parse_short_magic(magic, elem); return parse_short_magic(magic, elem);
} }


static void strip_submodule_slash_cheap(struct pathspec_item *item)
{
if (item->len >= 1 && item->match[item->len - 1] == '/') {
int i = cache_name_pos(item->match, item->len - 1);

if (i >= 0 && S_ISGITLINK(active_cache[i]->ce_mode)) {
item->len--;
item->match[item->len] = '\0';
}
}
}

/* /*
* Perform the initialization of a pathspec_item based on a pathspec element. * Perform the initialization of a pathspec_item based on a pathspec element.
*/ */
@ -470,9 +458,6 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
item->original = xstrdup(elt); item->original = xstrdup(elt);
} }


if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP)
strip_submodule_slash_cheap(item);

if (magic & PATHSPEC_LITERAL) { if (magic & PATHSPEC_LITERAL) {
item->nowildcard_len = item->len; item->nowildcard_len = item->len;
} else { } else {

10
pathspec.h
View File

@ -58,19 +58,17 @@ struct pathspec {
#define PATHSPEC_PREFER_CWD (1<<0) /* No args means match cwd */ #define PATHSPEC_PREFER_CWD (1<<0) /* No args means match cwd */
#define PATHSPEC_PREFER_FULL (1<<1) /* No args means match everything */ #define PATHSPEC_PREFER_FULL (1<<1) /* No args means match everything */
#define PATHSPEC_MAXDEPTH_VALID (1<<2) /* max_depth field is valid */ #define PATHSPEC_MAXDEPTH_VALID (1<<2) /* max_depth field is valid */
/* strip the trailing slash if the given path is a gitlink */
#define PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP (1<<3)
/* die if a symlink is part of the given path's directory */ /* die if a symlink is part of the given path's directory */
#define PATHSPEC_SYMLINK_LEADING_PATH (1<<4) #define PATHSPEC_SYMLINK_LEADING_PATH (1<<3)
#define PATHSPEC_PREFIX_ORIGIN (1<<5) #define PATHSPEC_PREFIX_ORIGIN (1<<4)
#define PATHSPEC_KEEP_ORDER (1<<6) #define PATHSPEC_KEEP_ORDER (1<<5)
/* /*
* For the callers that just need pure paths from somewhere else, not * For the callers that just need pure paths from somewhere else, not
* from command line. Global --*-pathspecs options are ignored. No * from command line. Global --*-pathspecs options are ignored. No
* magic is parsed in each pathspec either. If PATHSPEC_LITERAL is * magic is parsed in each pathspec either. If PATHSPEC_LITERAL is
* allowed, then it will automatically set for every pathspec. * allowed, then it will automatically set for every pathspec.
*/ */
#define PATHSPEC_LITERAL_PATH (1<<7) #define PATHSPEC_LITERAL_PATH (1<<6)


extern void parse_pathspec(struct pathspec *pathspec, extern void parse_pathspec(struct pathspec *pathspec,
unsigned magic_mask, unsigned magic_mask,