mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
73d66323ac
* nd/sparse: (25 commits) t7002: test for not using external grep on skip-worktree paths t7002: set test prerequisite "external-grep" if supported grep: do not do external grep on skip-worktree entries commit: correctly respect skip-worktree bit ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID tests: rename duplicate t1009 sparse checkout: inhibit empty worktree Add tests for sparse checkout read-tree: add --no-sparse-checkout to disable sparse checkout support unpack-trees(): ignore worktree check outside checkout area unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout unpack-trees.c: generalize verify_* functions unpack-trees(): add CE_WT_REMOVE to remove on worktree alone Introduce "sparse checkout" dir.c: export excluded_1() and add_excludes_from_file_1() excluded_1(): support exclude files in index unpack-trees(): carry skip-worktree bit over in merged_entry() Read .gitignore from index if it is skip-worktree Avoid writing to buffer in add_excludes_from_file_1() ... Conflicts: .gitignore Documentation/config.txt Documentation/git-update-index.txt Makefile entry.c t/t7002-grep.sh
103 lines
2.8 KiB
C
103 lines
2.8 KiB
C
#ifndef DIR_H
|
|
#define DIR_H
|
|
|
|
struct dir_entry {
|
|
unsigned int len;
|
|
char name[FLEX_ARRAY]; /* more */
|
|
};
|
|
|
|
#define EXC_FLAG_NODIR 1
|
|
#define EXC_FLAG_NOWILDCARD 2
|
|
#define EXC_FLAG_ENDSWITH 4
|
|
#define EXC_FLAG_MUSTBEDIR 8
|
|
|
|
struct exclude_list {
|
|
int nr;
|
|
int alloc;
|
|
struct exclude {
|
|
const char *pattern;
|
|
int patternlen;
|
|
const char *base;
|
|
int baselen;
|
|
int to_exclude;
|
|
int flags;
|
|
} **excludes;
|
|
};
|
|
|
|
struct exclude_stack {
|
|
struct exclude_stack *prev;
|
|
char *filebuf;
|
|
int baselen;
|
|
int exclude_ix;
|
|
};
|
|
|
|
struct dir_struct {
|
|
int nr, alloc;
|
|
int ignored_nr, ignored_alloc;
|
|
enum {
|
|
DIR_SHOW_IGNORED = 1<<0,
|
|
DIR_SHOW_OTHER_DIRECTORIES = 1<<1,
|
|
DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
|
|
DIR_NO_GITLINKS = 1<<3,
|
|
DIR_COLLECT_IGNORED = 1<<4
|
|
} flags;
|
|
struct dir_entry **entries;
|
|
struct dir_entry **ignored;
|
|
|
|
/* Exclude info */
|
|
const char *exclude_per_dir;
|
|
struct exclude_list exclude_list[3];
|
|
/*
|
|
* We maintain three exclude pattern lists:
|
|
* EXC_CMDL lists patterns explicitly given on the command line.
|
|
* EXC_DIRS lists patterns obtained from per-directory ignore files.
|
|
* EXC_FILE lists patterns from fallback ignore files.
|
|
*/
|
|
#define EXC_CMDL 0
|
|
#define EXC_DIRS 1
|
|
#define EXC_FILE 2
|
|
|
|
struct exclude_stack *exclude_stack;
|
|
char basebuf[PATH_MAX];
|
|
};
|
|
|
|
#define MATCHED_RECURSIVELY 1
|
|
#define MATCHED_FNMATCH 2
|
|
#define MATCHED_EXACTLY 3
|
|
extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
|
|
|
|
extern int fill_directory(struct dir_struct *dir, const char **pathspec);
|
|
extern int read_directory(struct dir_struct *, const char *path, int len, const char **pathspec);
|
|
|
|
extern int excluded_from_list(const char *pathname, int pathlen, const char *basename,
|
|
int *dtype, struct exclude_list *el);
|
|
extern int excluded(struct dir_struct *, const char *, int *);
|
|
extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
|
|
char **buf_p, struct exclude_list *which, int check_index);
|
|
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
|
|
extern void add_exclude(const char *string, const char *base,
|
|
int baselen, struct exclude_list *which);
|
|
extern int file_exists(const char *);
|
|
|
|
extern char *get_relative_cwd(char *buffer, int size, const char *dir);
|
|
extern int is_inside_dir(const char *dir);
|
|
|
|
static inline int is_dot_or_dotdot(const char *name)
|
|
{
|
|
return (name[0] == '.' &&
|
|
(name[1] == '\0' ||
|
|
(name[1] == '.' && name[2] == '\0')));
|
|
}
|
|
|
|
extern int is_empty_dir(const char *dir);
|
|
|
|
extern void setup_standard_excludes(struct dir_struct *dir);
|
|
|
|
#define REMOVE_DIR_EMPTY_ONLY 01
|
|
#define REMOVE_DIR_KEEP_NESTED_GIT 02
|
|
extern int remove_dir_recursively(struct strbuf *path, int flag);
|
|
|
|
/* tries to remove the path with empty directories along it, ignores ENOENT */
|
|
extern int remove_path(const char *path);
|
|
|
|
#endif
|