undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: rename prefix_pathspec to init_pathspec_item

Browse Source 
Give a more relevant name to the prefix_pathspec function as it does
more than just prefix a pathspec element.

Signed-off-by: Brandon Williams <bmwill@google.com>
Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-01-04 10:04:11 -08:00 committed by Junio C Hamano
parent 4f1bf4d2b4
commit 27ec42826e
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pathspec.c
View File

@ -297,19 +297,9 @@ static void strip_submodule_slash_expensive(struct pathspec_item *item)
} }
/* /*
* Take an element of a pathspec and check for magic signatures. * Perform the initialization of a pathspec_item based on a pathspec element.
* Append the result to the prefix. Return the magic bitmap.
*
* For now, we only parse the syntax and throw out anything other than
* "top" magic.
*
* NEEDSWORK: This needs to be rewritten when we start migrating
* get_pathspec() users to use the "struct pathspec" interface. For
* example, a pathspec element may be marked as case-insensitive, but
* the prefix part must always match literally, and a single stupid
* string cannot express such a case.
*/ */
static unsigned prefix_pathspec(struct pathspec_item *item, unsigned flags, static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
const char *prefix, int prefixlen, const char *prefix, int prefixlen,
const char *elt) const char *elt)
{ {
@ -329,6 +319,8 @@ static unsigned prefix_pathspec(struct pathspec_item *item, unsigned flags,
magic |= get_global_magic(element_magic); magic |= get_global_magic(element_magic);
} }
item->magic = magic;
if (pathspec_prefix >= 0 && if (pathspec_prefix >= 0 &&
(prefixlen || (prefix && *prefix))) (prefixlen || (prefix && *prefix)))
die("BUG: 'prefix' magic is supposed to be used at worktree's root"); die("BUG: 'prefix' magic is supposed to be used at worktree's root");
@ -401,7 +393,6 @@ static unsigned prefix_pathspec(struct pathspec_item *item, unsigned flags,
/* sanity checks, pathspec matchers assume these are sane */ /* sanity checks, pathspec matchers assume these are sane */
assert(item->nowildcard_len <= item->len && assert(item->nowildcard_len <= item->len &&
item->prefix <= item->len); item->prefix <= item->len);
return magic;
} }
static int pathspec_item_cmp(const void *a_, const void *b_) static int pathspec_item_cmp(const void *a_, const void *b_)
@ -501,8 +492,7 @@ void parse_pathspec(struct pathspec *pathspec,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
entry = argv[i]; entry = argv[i];
item[i].magic = prefix_pathspec(item + i, flags, init_pathspec_item(item + i, flags, prefix, prefixlen, entry);
prefix, prefixlen, entry);
if (item[i].magic & PATHSPEC_EXCLUDE) if (item[i].magic & PATHSPEC_EXCLUDE)
nr_exclude++; nr_exclude++;