Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / midx.c

diff --git a/midx.c b/midx.c
index 9a61d3b37d9a3607e6a53258760c9bfa7e732075..6d1584ca51d313343bbb65f9baa7c794259c7bf0 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -1293,15 +1293,26 @@ static int compare_by_mtime(const void *a_, const void *b_)
        return 0;
 }
 
-static int fill_included_packs_all(struct multi_pack_index *m,
+static int fill_included_packs_all(struct repository *r,
+                                  struct multi_pack_index *m,
                                   unsigned char *include_pack)
 {
-       uint32_t i;
+       uint32_t i, count = 0;
+       int pack_kept_objects = 0;
+
+       repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects);
+
+       for (i = 0; i < m->num_packs; i++) {
+               if (prepare_midx_pack(r, m, i))
+                       continue;
+               if (!pack_kept_objects && m->packs[i]->pack_keep)
+                       continue;
 
-       for (i = 0; i < m->num_packs; i++)
                include_pack[i] = 1;
+               count++;
+       }
 
-       return m->num_packs < 2;
+       return count < 2;
 }
 
 static int fill_included_packs_batch(struct repository *r,
@@ -1312,6 +1323,9 @@ static int fill_included_packs_batch(struct repository *r,
        uint32_t i, packs_to_repack;
        size_t total_size;
        struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info));
+       int pack_kept_objects = 0;
+
+       repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects);
 
        for (i = 0; i < m->num_packs; i++) {
                pack_info[i].pack_int_id = i;
@@ -1338,6 +1352,8 @@ static int fill_included_packs_batch(struct repository *r,
 
                if (!p)
                        continue;
+               if (!pack_kept_objects && p->pack_keep)
+                       continue;
                if (open_pack_index(p) || !p->num_objects)
                        continue;
 
@@ -1370,6 +1386,14 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
        struct strbuf base_name = STRBUF_INIT;
        struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
 
+       /*
+        * When updating the default for these configuration
+        * variables in builtin/repack.c, these must be adjusted
+        * to match.
+        */
+       int delta_base_offset = 1;
+       int use_delta_islands = 0;
+
        if (!m)
                return 0;
 
@@ -1378,15 +1402,23 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
        if (batch_size) {
                if (fill_included_packs_batch(r, m, include_pack, batch_size))
                        goto cleanup;
-       } else if (fill_included_packs_all(m, include_pack))
+       } else if (fill_included_packs_all(r, m, include_pack))
                goto cleanup;
 
+       repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset);
+       repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands);
+
        argv_array_push(&cmd.args, "pack-objects");
 
        strbuf_addstr(&base_name, object_dir);
        strbuf_addstr(&base_name, "/pack/pack");
        argv_array_push(&cmd.args, base_name.buf);
 
+       if (delta_base_offset)
+               argv_array_push(&cmd.args, "--delta-base-offset");
+       if (use_delta_islands)
+               argv_array_push(&cmd.args, "--delta-islands");
+
        if (flags & MIDX_PROGRESS)
                argv_array_push(&cmd.args, "--progress");
        else