Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
ls-files: convert show_ru_info to take an index
author
Brandon Williams
<bmwill@google.com>
Mon, 12 Jun 2017 22:14:02 +0000
(15:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Jun 2017 18:40:51 +0000
(11:40 -0700)
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/ls-files.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
23d6846
)
diff --git
a/builtin/ls-files.c
b/builtin/ls-files.c
index 5dbff949615fbaa59c24faea10eddba76c22f6a4..375fe09d1e7a9c58c9c99b25689fcf7607decf49 100644
(file)
--- a/
builtin/ls-files.c
+++ b/
builtin/ls-files.c
@@
-292,14
+292,14
@@
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
strbuf_release(&name);
}
strbuf_release(&name);
}
-static void show_ru_info(
void
)
+static void show_ru_info(
const struct index_state *istate
)
{
struct string_list_item *item;
{
struct string_list_item *item;
- if (!
the_index.
resolve_undo)
+ if (!
istate->
resolve_undo)
return;
return;
- for_each_string_list_item(item,
the_index.
resolve_undo) {
+ for_each_string_list_item(item,
istate->
resolve_undo) {
const char *path = item->string;
struct resolve_undo_info *ui = item->util;
int i, len;
const char *path = item->string;
struct resolve_undo_info *ui = item->util;
int i, len;
@@
-685,7
+685,7
@@
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
}
show_files(&dir);
if (show_resolve_undo)
}
show_files(&dir);
if (show_resolve_undo)
- show_ru_info();
+ show_ru_info(
&the_index
);
if (ps_matched) {
int bad;
if (ps_matched) {
int bad;