mirror of
https://github.com/git/git
synced 2024-07-02 15:48:44 +00:00
6330a17199
match_pathspec_depth() and tree_entry_interesting() check max_depth
field in order to support "git grep --max-depth". The feature
activation is tied to "recursive" field, which led to some unwanted
activation, e.g. 5c8eeb8 (diff-index: enable recursive pathspec
matching in unpack_trees - 2012-01-15).
This patch decouples the activation from "recursive" field, puts it in
"magic" field instead. This makes sure that only "git grep" can
activate this feature. And because parse_pathspec knows when the
feature is not used, it does not need to sort pathspec (required for
max_depth to work correctly). A small win for non-grep cases.
Even though a new magic flag is introduced, no magic syntax is. The
magic can be only enabled by parse_pathspec() caller. We might someday
want to support ":(maxdepth:10)src." It all depends on actual use
cases.
max_depth feature cannot be enabled via init_pathspec() anymore. But
that's ok because init_pathspec() is on its way to /dev/null.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1.5 KiB
C
52 lines
1.5 KiB
C
#ifndef PATHSPEC_H
|
|
#define PATHSPEC_H
|
|
|
|
/* Pathspec magic */
|
|
#define PATHSPEC_FROMTOP (1<<0)
|
|
#define PATHSPEC_MAXDEPTH (1<<1)
|
|
#define PATHSPEC_ALL_MAGIC \
|
|
(PATHSPEC_FROMTOP | \
|
|
PATHSPEC_MAXDEPTH)
|
|
|
|
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */
|
|
|
|
struct pathspec {
|
|
const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
|
|
int nr;
|
|
unsigned int has_wildcard:1;
|
|
unsigned int recursive:1;
|
|
unsigned magic;
|
|
int max_depth;
|
|
struct pathspec_item {
|
|
const char *match;
|
|
const char *original;
|
|
unsigned magic;
|
|
int len;
|
|
int nowildcard_len;
|
|
int flags;
|
|
} *items;
|
|
};
|
|
|
|
/* parse_pathspec flags */
|
|
#define PATHSPEC_PREFER_CWD (1<<0) /* No args means match cwd */
|
|
#define PATHSPEC_PREFER_FULL (1<<1) /* No args means match everything */
|
|
#define PATHSPEC_MAXDEPTH_VALID (1<<2) /* max_depth field is valid */
|
|
|
|
extern int init_pathspec(struct pathspec *, const char **);
|
|
extern void parse_pathspec(struct pathspec *pathspec,
|
|
unsigned magic_mask,
|
|
unsigned flags,
|
|
const char *prefix,
|
|
const char **args);
|
|
extern void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
|
|
extern void free_pathspec(struct pathspec *);
|
|
|
|
extern int limit_pathspec_to_literal(void);
|
|
|
|
extern char *find_pathspecs_matching_against_index(const char **pathspec);
|
|
extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs);
|
|
extern const char *check_path_for_gitlink(const char *path);
|
|
extern void die_if_path_beyond_symlink(const char *path, const char *prefix);
|
|
|
|
#endif /* PATHSPEC_H */
|