mirror of
https://github.com/git/git.git
synced 2026-03-13 02:13:24 +01:00
13bb0ce6b7
After we finish walking the working tree to find paths to add, the
prune_directory() function checks the pathspecs to find typoes in
them. When a given pathspec did not produce any match (either in the
untracked files, or paths already in the index), there are two cases:
- "git add no-such-file", i.e. the pathspec was misspelled; or
- "git add ignored-pattern.o", i.e. the pathspec exactly matches but is
ignored by the traversal.
For the former, the function immediately errored out. The latter were
queued in the dir structure and later used to give an error message with
"use -f if you really mean it" advice.
e96980e (builtin-add: simplify (and increase accuracy of) exclude
handling, 2007-06-12) somehow lost the latter. This adds the logic back,
but with a bit of twist, as it uses collect_ignored option that does half
the necessary work during the traversal.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
2.6 KiB
C
102 lines
2.6 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(struct dir_struct *, const char *, int *);
|
|
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);
|
|
|
|
extern void dir_add_ignored(struct dir_struct *, const char *, int);
|
|
|
|
#endif
|