提交 341003e7 编写于 作者: N Nguyễn Thái Ngọc Duy 提交者: Junio C Hamano

kill limit_pathspec_to_literal() as it's only used by parse_pathspec()

Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 233c3e6c
...@@ -1473,14 +1473,6 @@ int remove_path(const char *name) ...@@ -1473,14 +1473,6 @@ int remove_path(const char *name)
return 0; return 0;
} }
int limit_pathspec_to_literal(void)
{
static int flag = -1;
if (flag < 0)
flag = git_env_bool(GIT_LITERAL_PATHSPECS_ENVIRONMENT, 0);
return flag;
}
/* /*
* Frees memory within dir which was allocated for exclude lists and * Frees memory within dir which was allocated for exclude lists and
* the exclude_stack. Does not free dir itself. * the exclude_stack. Does not free dir itself.
......
...@@ -91,11 +91,15 @@ static unsigned prefix_pathspec(struct pathspec_item *item, ...@@ -91,11 +91,15 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
const char *prefix, int prefixlen, const char *prefix, int prefixlen,
const char *elt) const char *elt)
{ {
static int literal_global = -1;
unsigned magic = 0, short_magic = 0; unsigned magic = 0, short_magic = 0;
const char *copyfrom = elt, *long_magic_end = NULL; const char *copyfrom = elt, *long_magic_end = NULL;
char *match; char *match;
int i, pathspec_prefix = -1; int i, pathspec_prefix = -1;
if (literal_global < 0)
literal_global = git_env_bool(GIT_LITERAL_PATHSPECS_ENVIRONMENT, 0);
if (elt[0] != ':') { if (elt[0] != ':') {
; /* nothing to do */ ; /* nothing to do */
} else if (elt[1] == '(') { } else if (elt[1] == '(') {
...@@ -184,7 +188,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item, ...@@ -184,7 +188,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
if (flags & PATHSPEC_PREFIX_ORIGIN) { if (flags & PATHSPEC_PREFIX_ORIGIN) {
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
const char *start = elt; const char *start = elt;
if (prefixlen && !limit_pathspec_to_literal()) { if (prefixlen && !literal_global) {
/* Preserve the actual prefix length of each pattern */ /* Preserve the actual prefix length of each pattern */
if (long_magic_end) { if (long_magic_end) {
strbuf_add(&sb, start, long_magic_end - start); strbuf_add(&sb, start, long_magic_end - start);
...@@ -232,7 +236,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item, ...@@ -232,7 +236,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
elt, ce_len, ce->name); elt, ce_len, ce->name);
} }
if (limit_pathspec_to_literal()) if (literal_global)
item->nowildcard_len = item->len; item->nowildcard_len = item->len;
else { else {
item->nowildcard_len = simple_length(item->match); item->nowildcard_len = simple_length(item->match);
......
...@@ -61,8 +61,6 @@ extern void parse_pathspec(struct pathspec *pathspec, ...@@ -61,8 +61,6 @@ extern void parse_pathspec(struct pathspec *pathspec,
extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src); extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
extern void free_pathspec(struct pathspec *); extern void free_pathspec(struct pathspec *);
extern int limit_pathspec_to_literal(void);
extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec); extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec);
extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen); extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen);
extern const char *check_path_for_gitlink(const char *path); extern const char *check_path_for_gitlink(const char *path);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册