4d06f8ac43
When '*.ig' is ignored, and you have two files f.ig and d.ig/foo
in the working tree,
$ git add .
correctly ignored f.ig but failed to ignore d.ig/foo. This was
caused by a thinko in an earlier commit 4888c534, when we tried
to allow adding otherwise ignored files.
After reverting that commit, this takes a much simpler approach.
When we have an unmatched pathspec that talks about an existing
pathname, we know it is an ignored path the user tried to add,
so we include it in the set of paths directory walker returned.
This does not let you say "git add -f D" on an ignored directory
D and add everything under D. People can submit a patch to
further allow it if they want to, but I think it is a saner
behaviour to require explicit paths to be spelled out in such a
case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
#ifndef DIR_H
|
|
#define DIR_H
|
|
|
|
/*
|
|
* 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 dir_entry {
|
|
unsigned int ignored : 1;
|
|
unsigned int ignored_dir : 1;
|
|
unsigned int len : 30;
|
|
char name[FLEX_ARRAY]; /* more */
|
|
};
|
|
|
|
struct exclude_list {
|
|
int nr;
|
|
int alloc;
|
|
struct exclude {
|
|
const char *pattern;
|
|
const char *base;
|
|
int baselen;
|
|
} **excludes;
|
|
};
|
|
|
|
struct dir_struct {
|
|
int nr, alloc;
|
|
unsigned int show_ignored:1,
|
|
show_other_directories:1,
|
|
hide_empty_directories:1;
|
|
struct dir_entry **entries;
|
|
|
|
/* Exclude info */
|
|
const char *exclude_per_dir;
|
|
struct exclude_list exclude_list[3];
|
|
};
|
|
|
|
extern int common_prefix(const char **pathspec);
|
|
|
|
#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 read_directory(struct dir_struct *, const char *path, const char *base, int baselen);
|
|
extern int push_exclude_per_directory(struct dir_struct *, const char *, int);
|
|
extern void pop_exclude_per_directory(struct dir_struct *, int);
|
|
|
|
extern int excluded(struct dir_struct *, const char *);
|
|
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 struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
|
|
|
|
#endif
|