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

[thirdparty/git.git] / builtin / fast-import.c

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index f7548ff4a35c081d79af0d895cbf18ca888e2758..31b8732128d0afcb193518732952e049922ca8ae 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1,5 +1,8 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "cache.h"
+#include "environment.h"
+#include "gettext.h"
 #include "hex.h"
 #include "repository.h"
 #include "config.h"
@@ -16,11 +19,13 @@
 #include "dir.h"
 #include "run-command.h"
 #include "packfile.h"
+#include "object-name.h"
 #include "object-store.h"
 #include "mem-pool.h"
 #include "commit-reach.h"
 #include "khash.h"
 #include "date.h"
+#include "wrapper.h"
 
 #define PACK_ID_BITS 16
 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -1266,7 +1271,7 @@ static void load_tree(struct tree_entry *root)
                        die("Can't load tree %s", oid_to_hex(oid));
        } else {
                enum object_type type;
-               buf = read_object_file(oid, &type, &size);
+               buf = repo_read_object_file(the_repository, oid, &type, &size);
                if (!buf || type != OBJ_TREE)
                        die("Can't load tree %s", oid_to_hex(oid));
        }
@@ -1626,7 +1631,7 @@ static int update_branch(struct branch *b)
                if (!old_cmit || !new_cmit)
                        return error("Branch %s is missing commits.", b->name);
 
-               if (!in_merge_bases(old_cmit, new_cmit)) {
+               if (!repo_in_merge_bases(the_repository, old_cmit, new_cmit)) {
                        warning("Not updating %s"
                                " (new tip %s does not contain %s)",
                                b->name, oid_to_hex(&b->oid),
@@ -2487,7 +2492,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
                if (commit_oe->type != OBJ_COMMIT)
                        die("Mark :%" PRIuMAX " not a commit", commit_mark);
                oidcpy(&commit_oid, &commit_oe->idx.oid);
-       } else if (!get_oid(p, &commit_oid)) {
+       } else if (!repo_get_oid(the_repository, p, &commit_oid)) {
                unsigned long size;
                char *buf = read_object_with_reference(the_repository,
                                                       &commit_oid,
@@ -2600,7 +2605,7 @@ static int parse_objectish(struct branch *b, const char *objectish)
                        } else
                                parse_from_existing(b);
                }
-       } else if (!get_oid(objectish, &b->oid)) {
+       } else if (!repo_get_oid(the_repository, objectish, &b->oid)) {
                parse_from_existing(b);
                if (is_null_oid(&b->oid))
                        b->delete = 1;
@@ -2655,7 +2660,7 @@ static struct hash_list *parse_merge(unsigned int *count)
                        if (oe->type != OBJ_COMMIT)
                                die("Mark :%" PRIuMAX " not a commit", idnum);
                        oidcpy(&n->oid, &oe->idx.oid);
-               } else if (!get_oid(from, &n->oid)) {
+               } else if (!repo_get_oid(the_repository, from, &n->oid)) {
                        unsigned long size;
                        char *buf = read_object_with_reference(the_repository,
                                                               &n->oid,
@@ -2828,7 +2833,7 @@ static void parse_new_tag(const char *arg)
                oe = find_mark(marks, from_mark);
                type = oe->type;
                oidcpy(&oid, &oe->idx.oid);
-       } else if (!get_oid(from, &oid)) {
+       } else if (!repo_get_oid(the_repository, from, &oid)) {
                struct object_entry *oe = find_object(&oid);
                if (!oe) {
                        type = oid_object_info(the_repository, &oid, NULL);
@@ -2937,7 +2942,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
        char *buf;
 
        if (!oe || oe->pack_id == MAX_PACK_ID) {
-               buf = read_object_file(oid, &type, &size);
+               buf = repo_read_object_file(the_repository, oid, &type, &size);
        } else {
                type = oe->type;
                buf = gfi_unpack_entry(oe, &size);
@@ -3045,7 +3050,8 @@ static struct object_entry *dereference(struct object_entry *oe,
                buf = gfi_unpack_entry(oe, &size);
        } else {
                enum object_type unused;
-               buf = read_object_file(oid, &unused, &size);
+               buf = repo_read_object_file(the_repository, oid, &unused,
+                                           &size);
        }
        if (!buf)
                die("Can't load object %s", oid_to_hex(oid));