undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check-ignore: move setup into cmd_check_ignore()

Browse Source 
Initialisation of the dir_struct and path_exclude_check structs was
previously done within check_ignore().  This was acceptable since
check_ignore() was only called once per check-ignore invocation;
however the next commit will convert it into an inner loop which is
called once per line of STDIN when --stdin is given.  Therefore moving
the initialisation code out into cmd_check_ignore() ensures that
initialisation is still only performed once per check-ignore
invocation, and consequently that the output is identical whether
pathspecs are provided as CLI arguments or via STDIN.

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adam Spiers 2013-04-11 13:05:11 +01:00 committed by Junio C Hamano
parent ae3caf4c91
commit 0006d85c3a
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
builtin/check-ignore.c
View File

@ -63,30 +63,20 @@ static void output_exclude(const char *path, struct exclude *exclude)
} }
} }
static int check_ignore(const char *prefix, const char **pathspec) static int check_ignore(struct path_exclude_check *check,
const char *prefix, const char **pathspec)
{ {
struct dir_struct dir;
const char *path, *full_path; const char *path, *full_path;
char *seen; char *seen;
int num_ignored = 0, dtype = DT_UNKNOWN, i; int num_ignored = 0, dtype = DT_UNKNOWN, i;
struct path_exclude_check check;
struct exclude *exclude; struct exclude *exclude;
/* read_cache() is only necessary so we can watch out for submodules. */
if (read_cache() < 0)
die(_("index file corrupt"));
memset(&dir, 0, sizeof(dir));
dir.flags |= DIR_COLLECT_IGNORED;
setup_standard_excludes(&dir);
if (!pathspec || !*pathspec) { if (!pathspec || !*pathspec) {
if (!quiet) if (!quiet)
fprintf(stderr, "no pathspec given.\n"); fprintf(stderr, "no pathspec given.\n");
return 0; return 0;
} }
path_exclude_check_init(&check, &dir);
/* /*
* look for pathspecs matching entries in the index, since these * look for pathspecs matching entries in the index, since these
* should not be ignored, in order to be consistent with * should not be ignored, in order to be consistent with
@ -101,7 +91,7 @@ static int check_ignore(const char *prefix, const char **pathspec)
die_if_path_beyond_symlink(full_path, prefix); die_if_path_beyond_symlink(full_path, prefix);
exclude = NULL; exclude = NULL;
if (!seen[i]) { if (!seen[i]) {
exclude = last_exclude_matching_path(&check, full_path, exclude = last_exclude_matching_path(check, full_path,
-1, &dtype); -1, &dtype);
} }
if (!quiet && (exclude || show_non_matching)) if (!quiet && (exclude || show_non_matching))
@ -110,13 +100,11 @@ static int check_ignore(const char *prefix, const char **pathspec)
num_ignored++; num_ignored++;
} }
free(seen); free(seen);
clear_directory(&dir);
path_exclude_check_clear(&check);
return num_ignored; return num_ignored;
} }
static int check_ignore_stdin_paths(const char *prefix) static int check_ignore_stdin_paths(struct path_exclude_check *check, const char *prefix)
{ {
struct strbuf buf, nbuf; struct strbuf buf, nbuf;
char **pathspec = NULL; char **pathspec = NULL;
@ -139,17 +127,18 @@ static int check_ignore_stdin_paths(const char *prefix)
} }
ALLOC_GROW(pathspec, nr + 1, alloc); ALLOC_GROW(pathspec, nr + 1, alloc);
pathspec[nr] = NULL; pathspec[nr] = NULL;
num_ignored = check_ignore(prefix, (const char **)pathspec); num_ignored = check_ignore(check, prefix, (const char **)pathspec);
maybe_flush_or_die(stdout, "attribute to stdout"); maybe_flush_or_die(stdout, "attribute to stdout");
strbuf_release(&buf); strbuf_release(&buf);
strbuf_release(&nbuf); strbuf_release(&nbuf);
free(pathspec);
return num_ignored; return num_ignored;
} }
int cmd_check_ignore(int argc, const char **argv, const char *prefix) int cmd_check_ignore(int argc, const char **argv, const char *prefix)
{ {
int num_ignored; int num_ignored;
struct dir_struct dir;
struct path_exclude_check check;
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
@ -174,12 +163,24 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix)
if (show_non_matching && !verbose) if (show_non_matching && !verbose)
die(_("--non-matching is only valid with --verbose")); die(_("--non-matching is only valid with --verbose"));
/* read_cache() is only necessary so we can watch out for submodules. */
if (read_cache() < 0)
die(_("index file corrupt"));
memset(&dir, 0, sizeof(dir));
dir.flags |= DIR_COLLECT_IGNORED;
setup_standard_excludes(&dir);
path_exclude_check_init(&check, &dir);
if (stdin_paths) { if (stdin_paths) {
num_ignored = check_ignore_stdin_paths(prefix); num_ignored = check_ignore_stdin_paths(&check, prefix);
} else { } else {
num_ignored = check_ignore(prefix, argv); num_ignored = check_ignore(&check, prefix, argv);
maybe_flush_or_die(stdout, "ignore to stdout"); maybe_flush_or_die(stdout, "ignore to stdout");
} }
clear_directory(&dir);
path_exclude_check_clear(&check);
return !num_ignored; return !num_ignored;
} }