diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:57:06 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:57:06 -0800 |
commit | 987e315a6b5a5dd224602f09b9dc7c0fe9c7d024 (patch) | |
tree | ce10af22609413c4316e12335387bcfa0ef1bf9b /dir.h | |
parent | Merge branch 'pb/prepare-commit-msg' (diff) | |
parent | gitignore: lazily find dtype (diff) | |
download | tgif-987e315a6b5a5dd224602f09b9dc7c0fe9c7d024.tar.xz |
Merge branch 'jc/gitignore-ends-with-slash'
* jc/gitignore-ends-with-slash:
gitignore: lazily find dtype
gitignore(5): Allow "foo/" in ignore list to match directory "foo"
Diffstat (limited to 'dir.h')
-rw-r--r-- | dir.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -9,6 +9,7 @@ struct dir_entry { #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; @@ -67,7 +68,7 @@ extern int match_pathspec(const char **pathspec, const char *name, int namelen, extern int read_directory(struct dir_struct *, const char *path, const char *base, int baselen, const char **pathspec); -extern int excluded(struct dir_struct *, const char *); +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); |