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

[thirdparty/git.git] / tree.c

diff --git a/tree.c b/tree.c
index 410e3b477e557f55ad6843e1106567a3fd155557..e9d51ce2e00c00bf2ae7e2bee8daf69cb809620a 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,8 @@
 #include "cache.h"
 #include "cache-tree.h"
+#include "hex.h"
 #include "tree.h"
+#include "object-name.h"
 #include "object-store.h"
 #include "blob.h"
 #include "commit.h"
@@ -58,7 +60,7 @@ int read_tree_at(struct repository *r,
                                    oid_to_hex(&entry.oid),
                                    base->buf, entry.path);
 
-                       if (parse_commit(commit))
+                       if (repo_parse_commit(r, commit))
                                die("Invalid commit %s in submodule path %s%s",
                                    oid_to_hex(&entry.oid),
                                    base->buf, entry.path);
@@ -129,7 +131,8 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)
 
        if (item->object.parsed)
                return 0;
-       buffer = read_object_file(&item->object.oid, &type, &size);
+       buffer = repo_read_object_file(the_repository, &item->object.oid,
+                                      &type, &size);
        if (!buffer)
                return quiet_on_missing ? -1 :
                        error("Could not read %s",