summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-06-12 22:14:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-13 18:40:51 (GMT)
commitff020a8ab0a40a3f938a30be6d73607c2041cc34 (patch)
tree3b1daa70044687bb0fd259e5e5d910db4181582f /builtin/ls-files.c
parent6510ae173a8630e39a225f15031a7975547979ec (diff)
downloadgit-ff020a8ab0a40a3f938a30be6d73607c2041cc34.zip
git-ff020a8ab0a40a3f938a30be6d73607c2041cc34.tar.gz
git-ff020a8ab0a40a3f938a30be6d73607c2041cc34.tar.bz2
ls-files: convert show_ce_entry to take an index
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/ls-files.c')
-rw-r--r--builtin/ls-files.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index b1626b1..927aa67 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -232,7 +232,8 @@ static void show_gitlink(const struct cache_entry *ce)
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;
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),
ce_stage(ce));
}
- write_eolinfo(&the_index, ce, ce->name);
+ write_eolinfo(istate, ce, ce->name);
write_name(ce->name);
if (debug_mode) {
const struct stat_data *sd = &ce->ce_stat_data;
@@ -352,7 +353,7 @@ static void show_files(struct dir_struct *dir)
continue;
if (ce->ce_flags & CE_UPDATE)
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);
}
}
@@ -370,9 +371,9 @@ static void show_files(struct dir_struct *dir)
continue;
err = lstat(ce->name, &st);
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))
- show_ce_entry(tag_modified, ce);
+ show_ce_entry(&the_index, tag_modified, ce);
}
}
}