kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

dir.c: support tracing exclude 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2016-02-15 16:03:37 +07:00 committed by Junio C Hamano
parent a60ea8fb66
commit bac65a2be5
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-check-ignore.txt
View File

@ -114,6 +114,7 @@ SEE ALSO
linkgit:gitignore[5] linkgit:gitignore[5]
linkgit:gitconfig[5] linkgit:gitconfig[5]
linkgit:git-ls-files[1] linkgit:git-ls-files[1]
GIT_TRACE_EXCLUDE in linkgit:git[1]


GIT GIT
--- ---

5
Documentation/git.txt
View File

@ -1064,6 +1064,11 @@ of clones and fetches.
cloning of shallow repositories. cloning of shallow repositories.
See 'GIT_TRACE' for available trace output options. See 'GIT_TRACE' for available trace output options.


'GIT_TRACE_EXCLUDE'::
Enables trace messages that can help debugging .gitignore
processing. See 'GIT_TRACE' for available trace output
options.

'GIT_LITERAL_PATHSPECS':: 'GIT_LITERAL_PATHSPECS'::
Setting this variable to `1` will cause Git to treat all Setting this variable to `1` will cause Git to treat all
pathspecs literally, rather than as glob patterns. For example, pathspecs literally, rather than as glob patterns. For example,

20
dir.c
View File

@ -53,6 +53,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
int check_only, const struct path_simplify *simplify); int check_only, const struct path_simplify *simplify);
static int get_dtype(struct dirent *de, const char *path, int len); static int get_dtype(struct dirent *de, const char *path, int len);


static struct trace_key trace_exclude = TRACE_KEY_INIT(EXCLUDE);

/* helper string functions with support for the ignore_case flag */ /* helper string functions with support for the ignore_case flag */
int strcmp_icase(const char *a, const char *b) int strcmp_icase(const char *a, const char *b)
{ {
@ -905,6 +907,8 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
if (!el->nr) if (!el->nr)
return NULL; /* undefined */ return NULL; /* undefined */


trace_printf_key(&trace_exclude, "exclude: from %s\n", el->src);

for (i = el->nr - 1; 0 <= i; i--) { for (i = el->nr - 1; 0 <= i; i--) {
struct exclude *x = el->excludes[i]; struct exclude *x = el->excludes[i];
const char *exclude = x->pattern; const char *exclude = x->pattern;
@ -936,6 +940,16 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
break; break;
} }
} }

if (!exc) {
trace_printf_key(&trace_exclude, "exclude: %.*s => n/a\n",
pathlen, pathname);
return NULL;
}

trace_printf_key(&trace_exclude, "exclude: %.*s vs %s at line %d => %s\n",
pathlen, pathname, exc->pattern, exc->srcpos,
exc->flags & EXC_FLAG_NEGATIVE ? "no" : "yes");
return exc; return exc;
} }


@ -1683,9 +1697,13 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
struct cached_dir cdir; struct cached_dir cdir;
enum path_treatment state, subdir_state, dir_state = path_none; enum path_treatment state, subdir_state, dir_state = path_none;
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
static int level = 0;


strbuf_add(&path, base, baselen); strbuf_add(&path, base, baselen);


trace_printf_key(&trace_exclude, "exclude: [%d] enter '%.*s'\n",
level++, baselen, base);

if (open_cached_dir(&cdir, dir, untracked, &path, check_only)) if (open_cached_dir(&cdir, dir, untracked, &path, check_only))
goto out; goto out;


@ -1749,6 +1767,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
} }
close_cached_dir(&cdir); close_cached_dir(&cdir);
out: out:
trace_printf_key(&trace_exclude, "exclude: [%d] leave '%.*s'\n",
--level, baselen, base);
strbuf_release(&path); strbuf_release(&path);


return dir_state; return dir_state;