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

ls-files: convert show_other_files to take an index 

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2017-06-12 15:14:01 -07:00 committed by Junio C Hamano
parent 23d6236a07
commit 23d6846b23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/ls-files.c
View File

@ -108,13 +108,14 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
write_name(ent->name); write_name(ent->name);
} }


static void show_other_files(struct dir_struct *dir) static void show_other_files(const struct index_state *istate,
const struct dir_struct *dir)
{ {
int i; int i;


for (i = 0; i < dir->nr; i++) { for (i = 0; i < dir->nr; i++) {
struct dir_entry *ent = dir->entries[i]; struct dir_entry *ent = dir->entries[i];
if (!cache_name_is_other(ent->name, ent->len)) if (!index_name_is_other(istate, ent->name, ent->len))
continue; continue;
show_dir_entry(tag_other, ent); show_dir_entry(tag_other, ent);
} }
@ -336,7 +337,7 @@ static void show_files(struct dir_struct *dir)
dir->flags |= DIR_COLLECT_KILLED_ONLY; dir->flags |= DIR_COLLECT_KILLED_ONLY;
fill_directory(dir, &the_index, &pathspec); fill_directory(dir, &the_index, &pathspec);
if (show_others) if (show_others)
show_other_files(dir); show_other_files(&the_index, dir);
if (show_killed) if (show_killed)
show_killed_files(&the_index, dir); show_killed_files(&the_index, dir);
} }