object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / builtin / ls-files.c

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a03b559ecaab4caeba9a9a18bb268f22274e7b2a..ce083cb8efddd0db49f546b5ac0ab60a3fb4ec4a 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -8,9 +8,12 @@
 #include "cache.h"
 #include "repository.h"
 #include "config.h"
+#include "convert.h"
 #include "quote.h"
 #include "dir.h"
 #include "builtin.h"
+#include "gettext.h"
+#include "object-name.h"
 #include "strbuf.h"
 #include "tree.h"
 #include "cache-tree.h"
@@ -19,6 +22,7 @@
 #include "string-list.h"
 #include "pathspec.h"
 #include "run-command.h"
+#include "setup.h"
 #include "submodule.h"
 #include "submodule-config.h"
 
@@ -360,7 +364,7 @@ static void show_ru_info(struct index_state *istate)
                        if (!ui->mode[i])
                                continue;
                        printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
-                              find_unique_abbrev(&ui->oid[i], abbrev),
+                              repo_find_unique_abbrev(the_repository, &ui->oid[i], abbrev),
                               i + 1);
                        write_name(path);
                }
@@ -575,7 +579,7 @@ void overlay_tree_on_index(struct index_state *istate,
        read_tree_fn_t fn = NULL;
        int err;
 
-       if (get_oid(tree_name, &oid))
+       if (repo_get_oid(the_repository, tree_name, &oid))
                die("tree-ish %s not found.", tree_name);
        tree = parse_tree_indirect(&oid);
        if (!tree)