diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 01:47:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 01:47:25 +0400 |
| commit | d912b0e44f82dc430a4aac8566a8217b60629638 (patch) | |
| tree | 2f8336f1fe82a9b1ca4786c6af31a90ffbeb2356 /builtin/ls-files.c | |
| parent | 20e47e50a1a3e2f0781cafe4bb250aa2d9a28c10 (diff) | |
| parent | f61988125130ac091bfb69bda5d62b0ad8f054c4 (diff) | |
Merge branch 'as/dir-c-cleanup'
Refactor and generally clean up the directory traversal API
implementation.
* as/dir-c-cleanup:
dir.c: rename free_excludes() to clear_exclude_list()
dir.c: refactor is_path_excluded()
dir.c: refactor is_excluded()
dir.c: refactor is_excluded_from_list()
dir.c: rename excluded() to is_excluded()
dir.c: rename excluded_from_list() to is_excluded_from_list()
dir.c: rename path_excluded() to is_path_excluded()
dir.c: rename cryptic 'which' variable to more consistent name
Improve documentation and comments regarding directory traversal API
api-directory-listing.txt: update to match code
Diffstat (limited to 'builtin/ls-files.c')
| -rw-r--r-- | builtin/ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 4a9ee690c7..373c573449 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -203,7 +203,7 @@ static void show_ru_info(void) static int ce_excluded(struct path_exclude_check *check, struct cache_entry *ce) { int dtype = ce_to_dtype(ce); - return path_excluded(check, ce->name, ce_namelen(ce), &dtype); + return is_path_excluded(check, ce->name, ce_namelen(ce), &dtype); } static void show_files(struct dir_struct *dir) |