Browse Source

ls-files: convert write_eolinfo to take an index

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 8 years ago committed by Junio C Hamano
parent
commit
1985fd68c6
  1. 13
      builtin/ls-files.c

13
builtin/ls-files.c

@ -53,17 +53,16 @@ static const char *tag_modified = "";
static const char *tag_skip_worktree = ""; static const char *tag_skip_worktree = "";
static const char *tag_resolve_undo = ""; static const char *tag_resolve_undo = "";


static void write_eolinfo(const struct cache_entry *ce, const char *path) static void write_eolinfo(const struct index_state *istate,
const struct cache_entry *ce, const char *path)
{ {
if (!show_eol) if (show_eol) {
return;
else {
struct stat st; struct stat st;
const char *i_txt = ""; const char *i_txt = "";
const char *w_txt = ""; const char *w_txt = "";
const char *a_txt = get_convert_attr_ascii(path); const char *a_txt = get_convert_attr_ascii(path);
if (ce && S_ISREG(ce->ce_mode)) if (ce && S_ISREG(ce->ce_mode))
i_txt = get_cached_convert_stats_ascii(&the_index, i_txt = get_cached_convert_stats_ascii(istate,
ce->name); ce->name);
if (!lstat(path, &st) && S_ISREG(st.st_mode)) if (!lstat(path, &st) && S_ISREG(st.st_mode))
w_txt = get_wt_convert_stats_ascii(path); w_txt = get_wt_convert_stats_ascii(path);
@ -105,7 +104,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
return; return;


fputs(tag, stdout); fputs(tag, stdout);
write_eolinfo(NULL, ent->name); write_eolinfo(NULL, NULL, ent->name);
write_name(ent->name); write_name(ent->name);
} }


@ -275,7 +274,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(ce, ce->name); write_eolinfo(&the_index, 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;

Loading…
Cancel
Save