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

ls-files: convert show_ce_entry to take an index

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-06-12 15:14:05 -07:00 committed by Junio C Hamano
parent 6510ae173a
commit ff020a8ab0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/ls-files.c
View File

@ -232,7 +232,8 @@ static void show_gitlink(const struct cache_entry *ce)
exit(status); exit(status);
} }
static void show_ce_entry(const char *tag, const struct cache_entry *ce) static void show_ce_entry(const struct index_state *istate,
const char *tag, const struct cache_entry *ce)
{ {
struct strbuf name = STRBUF_INIT; struct strbuf name = STRBUF_INIT;
int len = max_prefix_len; int len = max_prefix_len;
@ -276,7 +277,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)
find_unique_abbrev(ce->oid.hash, abbrev), find_unique_abbrev(ce->oid.hash, abbrev),
ce_stage(ce)); ce_stage(ce));
} }
write_eolinfo(&the_index, ce, ce->name); write_eolinfo(istate, ce, ce->name);
write_name(ce->name); write_name(ce->name);
if (debug_mode) { if (debug_mode) {
const struct stat_data *sd = &ce->ce_stat_data; const struct stat_data *sd = &ce->ce_stat_data;
@ -352,7 +353,7 @@ static void show_files(struct dir_struct *dir)
continue; continue;
if (ce->ce_flags & CE_UPDATE) if (ce->ce_flags & CE_UPDATE)
continue; continue;
show_ce_entry(ce_stage(ce) ? tag_unmerged : show_ce_entry(&the_index, ce_stage(ce) ? tag_unmerged :
(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce); (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
} }
} }
@ -370,9 +371,9 @@ static void show_files(struct dir_struct *dir)
continue; continue;
err = lstat(ce->name, &st); err = lstat(ce->name, &st);
if (show_deleted && err) if (show_deleted && err)
show_ce_entry(tag_removed, ce); show_ce_entry(&the_index, tag_removed, ce);
if (show_modified && ce_modified(ce, &st, 0)) if (show_modified && ce_modified(ce, &st, 0))
show_ce_entry(tag_modified, ce); show_ce_entry(&the_index, tag_modified, ce);
} }
} }
} }