mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP

Browse Source 
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>
This commit is contained in:
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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
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.
*/
@ -470,9 +458,6 @@ 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 (magic & PATHSPEC_LITERAL) {
item->nowildcard_len = item->len;
} else {