Merge git://ozlabs.org/~paulus/gitk

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 4a9ee690c7dcbaaf90f9511489b8f3b7b17b3c87..373c573449b5771f9b56d7d4ce04e4c0b3957cd9 100644 (file)
--- 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)