packfile: convert find_pack_entry to object_id

diff --git a/sha1_name.c b/sha1_name.c
index 509a95f0cfdcac749afd5d21469c9338025fedd7..7043652a24da031e03facd8a5b95fce4abce7b77 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -179,7 +179,6 @@ static void find_short_packed_object(struct disambiguate_state *ds)
 {
        struct packed_git *p;
 
-       prepare_packed_git();
        for (p = get_packed_git(the_repository); p && !ds->ambiguous;
             p = p->next)
                unique_in_pack(p, ds);
@@ -534,7 +533,6 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
 {
        struct packed_git *p;
 
-       prepare_packed_git();
        for (p = get_packed_git(the_repository); p; p = p->next)
                find_abbrev_len_for_pack(p, mad);
 }
@@ -1700,7 +1698,6 @@ static int get_oid_with_context_1(const char *name,
                                                                   name, len);
                                }
                        }
-                       hashcpy(oc->tree, tree_oid.hash);
                        if (flags & GET_OID_RECORD_PATH)
                                oc->path = xstrdup(filename);