subtree: improve decision on merges kept in split

diff --git a/midx.c b/midx.c
index 6824acf5f8937910edfc74ca0827cec1f4416cfb..f3e8dbc10820303436c07126b85d6024d2fb3e56 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -197,7 +197,7 @@ static void close_midx(struct multi_pack_index *m)
        FREE_AND_NULL(m->pack_names);
 }
 
-static int prepare_midx_pack(struct multi_pack_index *m, uint32_t pack_int_id)
+int prepare_midx_pack(struct multi_pack_index *m, uint32_t pack_int_id)
 {
        struct strbuf pack_name = STRBUF_INIT;
 
@@ -280,6 +280,16 @@ static int nth_midxed_pack_entry(struct multi_pack_index *m, struct pack_entry *
        if (!is_pack_valid(p))
                return 0;
 
+       if (p->num_bad_objects) {
+               uint32_t i;
+               struct object_id oid;
+               nth_midxed_object_oid(&oid, m, pos);
+               for (i = 0; i < p->num_bad_objects; i++)
+                       if (!hashcmp(oid.hash,
+                                    p->bad_object_sha1 + the_hash_algo->rawsz * i))
+                               return 0;
+       }
+
        e->offset = nth_midxed_offset(m, pos);
        e->p = p;
 
@@ -321,7 +331,7 @@ int midx_contains_pack(struct multi_pack_index *m, const char *idx_name)
 
 int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local)
 {
-       struct multi_pack_index *m = r->objects->multi_pack_index;
+       struct multi_pack_index *m;
        struct multi_pack_index *m_search;
        int config_value;
 
@@ -329,14 +339,15 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i
            !config_value)
                return 0;
 
-       for (m_search = m; m_search; m_search = m_search->next)
+       for (m_search = r->objects->multi_pack_index; m_search; m_search = m_search->next)
                if (!strcmp(object_dir, m_search->object_dir))
                        return 1;
 
-       r->objects->multi_pack_index = load_multi_pack_index(object_dir, local);
+       m = load_multi_pack_index(object_dir, local);
 
-       if (r->objects->multi_pack_index) {
-               r->objects->multi_pack_index->next = m;
+       if (m) {
+               m->next = r->objects->multi_pack_index;
+               r->objects->multi_pack_index = m;
                return 1;
        }