diff options
| author |  Karsten Blees <karsten.blees@gmail.com> | 2013-04-15 21:12:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:34:01 -0700 |
| commit | b07bc8c8c3c492d657a8bedf04ff939763ea8222 (patch) | |
| tree | d4d0bad28133aa9e14576c380d244ffd25dbf9e6 /builtin/check-ignore.c | |
| parent | dir.c: unify is_excluded and is_path_excluded APIs (diff) | |
| download | tgif-b07bc8c8c3c492d657a8bedf04ff939763ea8222.tar.xz | |
dir.c: replace is_path_excluded with now equivalent is_excluded API
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/check-ignore.c')
| -rw-r--r-- | builtin/check-ignore.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 0240f99b57..7388346ef2 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -59,7 +59,6 @@ static int check_ignore(const char *prefix, const char **pathspec) const char *path, *full_path; char *seen; int num_ignored = 0, dtype = DT_UNKNOWN, i; - struct path_exclude_check check; struct exclude *exclude; /* read_cache() is only necessary so we can watch out for submodules. */ @@ -76,7 +75,6 @@ static int check_ignore(const char *prefix, const char **pathspec) return 0; } - path_exclude_check_init(&check, &dir); /* * look for pathspecs matching entries in the index, since these * should not be ignored, in order to be consistent with @@ -90,8 +88,7 @@ static int check_ignore(const char *prefix, const char **pathspec) full_path = check_path_for_gitlink(full_path); die_if_path_beyond_symlink(full_path, prefix); if (!seen[i]) { - exclude = last_exclude_matching_path(&check, full_path, - -1, &dtype); + exclude = last_exclude_matching(&dir, full_path, &dtype); if (exclude) { if (!quiet) output_exclude(path, exclude); @@ -101,7 +98,6 @@ static int check_ignore(const char *prefix, const char **pathspec) } free(seen); clear_directory(&dir); - path_exclude_check_clear(&check); return num_ignored; } |