[PATCH 4/8] pathspec: rename PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
- From
- Brandon Williams <bmwill@google.com>
- Date
- May 9, 2017, 19:18 UTC
- Message-ID
- <20170509191805.176266-5-bmwill@google.com>
- In-Reply-To
- <20170509191805.176266-1-bmwill@google.com>
Now that there is only a single flag which strips a submodule slash, rename PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to PATHSPEC_STRIP_SUBMODULE_SLASH.
Signed-off-by: Brandon Williams <bmwill@google.com> --- builtin/add.c | 2 +- builtin/check-ignore.c | 2 +- builtin/ls-files.c | 2 +- builtin/reset.c | 2 +- builtin/rm.c | 2 +- builtin/submodule--helper.c | 2 +- pathspec.c | 6 +++--- pathspec.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c index 2aa9aeab9..51d7a5506 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -389,7 +389,7 @@ 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_CHEAP | + PATHSPEC_STRIP_SUBMODULE_SLASH | PATHSPEC_SUBMODULE_LEADING_PATH, prefix, argv); diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 73237b2b1..694e4c61b 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -88,7 +88,7 @@ static int check_ignore(struct dir_struct *dir, PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP, PATHSPEC_SYMLINK_LEADING_PATH | PATHSPEC_SUBMODULE_LEADING_PATH | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP | + PATHSPEC_STRIP_SUBMODULE_SLASH | PATHSPEC_KEEP_ORDER, prefix, argv); diff --git a/builtin/ls-files.c b/builtin/ls-files.c index d449e46db..e9dee2e41 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -618,7 +618,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, + PATHSPEC_STRIP_SUBMODULE_SLASH, prefix, argv); /* diff --git a/builtin/reset.c b/builtin/reset.c index fc3b906c4..529f2f9be 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -236,7 +236,7 @@ static void parse_args(struct pathspec *pathspec, parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP | + PATHSPEC_STRIP_SUBMODULE_SLASH | (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0), prefix, argv); } diff --git a/builtin/rm.c b/builtin/rm.c index fb79dcab1..8fe12d0a7 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -272,7 +272,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, + PATHSPEC_STRIP_SUBMODULE_SLASH, prefix, argv); refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL); diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 85aafe46a..69149b557 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -234,7 +234,7 @@ static int module_list_compute(int argc, const char **argv, char *ps_matched = NULL; parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, + PATHSPEC_STRIP_SUBMODULE_SLASH, prefix, argv); if (pathspec->nr) diff --git a/pathspec.c b/pathspec.c index f37d5769d..a1297ca02 100644 --- a/pathspec.c +++ b/pathspec.c @@ -386,7 +386,7 @@ static const char *parse_element_magic(unsigned *magic, int *prefix_len, return parse_short_magic(magic, elem); } -static void strip_submodule_slash_cheap(struct pathspec_item *item) +static void strip_submodule_slash(struct pathspec_item *item) { if (item->len >= 1 && item->match[item->len - 1] == '/') { int i = cache_name_pos(item->match, item->len - 1); @@ -496,8 +496,8 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags, item->original = xstrdup(elt); } - if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP) - strip_submodule_slash_cheap(item); + if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH) + strip_submodule_slash(item); if (magic & PATHSPEC_LITERAL) { item->nowildcard_len = item->len; diff --git a/pathspec.h b/pathspec.h index 93a819cbf..dd6456d5d 100644 --- a/pathspec.h +++ b/pathspec.h @@ -59,7 +59,7 @@ struct pathspec { #define PATHSPEC_PREFER_FULL (1<<1) /* No args means match everything */ #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) +#define PATHSPEC_STRIP_SUBMODULE_SLASH (1<<3) /* die if a symlink is part of the given path's directory */ #define PATHSPEC_SYMLINK_LEADING_PATH (1<<4) /*
-- 2.13.0.rc2.291.g57267f2277-goog