When constructing a multi-pack-index file for a given object directory,
read the files within the enclosed pack directory and find matches that
end with ".idx" and find the correct paired packfile using
add_packed_git().
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
midx.c | 45 ++++++++++++++++++++++++++++++++++++-
t/t5319-multi-pack-index.sh | 16 ++++++-------
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/midx.c b/midx.c
index 0977397d6a..e79ffb5576 100644
--- a/midx.c
+++ b/midx.c
@@ -1,6 +1,8 @@
#include "cache.h"
#include "csum-file.h"
+#include "dir.h"
#include "lockfile.h"
+#include "packfile.h"
#include "object-store.h"
#include "midx.h"
@@ -107,12 +109,40 @@ static size_t write_midx_header(struct hashfile *f,
return MIDX_HEADER_SIZE;
}
+struct pack_list
+{
+ struct packed_git **list;
+ uint32_t nr;
+ uint32_t alloc;
+};
+
+static void add_pack_to_midx(const char *full_path, size_t full_path_len,
+ const char *file_name, void *data)
+{
+ struct pack_list *packs = (struct pack_list *)data;
+
+ if (ends_with(file_name, ".idx")) {
+ ALLOC_GROW(packs->list, packs->nr + 1, packs->alloc);
+
+ packs->list[packs->nr] = add_packed_git(full_path,
+ full_path_len,
+ 0);
+ if (!packs->list[packs->nr])
+ warning(_("failed to add packfile '%s'"),
+ full_path);
+ else
+ packs->nr++;
+ }
+}
+
int write_midx_file(const char *object_dir)
{
unsigned char num_chunks = 0;
char *midx_name;
+ uint32_t i;
struct hashfile *f;
struct lock_file lk;
+ struct pack_list packs;
midx_name = get_midx_filename(object_dir);
if (safe_create_leading_directories(midx_name)) {
@@ -121,14 +151,27 @@ int write_midx_file(const char *object_dir)
midx_name);
}
+ packs.nr = 0;
+ packs.alloc = 16;
+ packs.list = NULL;
+ ALLOC_ARRAY(packs.list, packs.alloc);
+
+ for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
+
hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
FREE_AND_NULL(midx_name);
- write_midx_header(f, num_chunks, 0);
+ write_midx_header(f, num_chunks, packs.nr);
finalize_hashfile(f, NULL, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
commit_lock_file(&lk);
+ for (i = 0; i < packs.nr; i++) {
+ close_pack(packs.list[i]);
+ FREE_AND_NULL(packs.list[i]);
+ }
+
+ FREE_AND_NULL(packs.list);
return 0;
}
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index d533fd0dbc..4d4d6ca0a6 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -4,8 +4,9 @@ test_description='multi-pack-indexes'
. ./test-lib.sh
midx_read_expect() {
+ NUM_PACKS=$1
cat >expect <<- EOF
- header: 4d494458 1 0 0
+ header: 4d494458 1 0 $NUM_PACKS
object_dir: .
EOF
test-tool read-midx . >actual &&
@@ -15,8 +16,7 @@ midx_read_expect() {
test_expect_success 'write midx with no packs' '
test_when_finished rm pack/multi-pack-index &&
git multi-pack-index --object-dir=. write &&
- test_path_is_file pack/multi-pack-index &&
- midx_read_expect
+ midx_read_expect 0
'
test_expect_success 'create objects' '
@@ -47,13 +47,13 @@ test_expect_success 'write midx with one v1 pack' '
pack=$(git pack-objects --index-version=1 pack/test <obj-list) &&
test_when_finished rm pack/test-$pack.pack pack/test-$pack.idx pack/multi-pack-index &&
git multi-pack-index --object-dir=. write &&
- midx_read_expect
+ midx_read_expect 1
'
test_expect_success 'write midx with one v2 pack' '
git pack-objects --index-version=2,0x40 pack/test <obj-list &&
git multi-pack-index --object-dir=. write &&
- midx_read_expect
+ midx_read_expect 1
'
test_expect_success 'Add more objects' '
@@ -83,7 +83,7 @@ test_expect_success 'Add more objects' '
test_expect_success 'write midx with two packs' '
git pack-objects --index-version=1 pack/test-2 <obj-list2 &&
git multi-pack-index --object-dir=. write &&
- midx_read_expect
+ midx_read_expect 2
'
test_expect_success 'Add more packs' '
@@ -106,7 +106,7 @@ test_expect_success 'Add more packs' '
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
} >obj-list &&
git update-ref HEAD $commit &&
- git pack-objects --index-version=2 test-pack <obj-list &&
+ git pack-objects --index-version=2 pack/test-pack <obj-list &&
i=$(expr $i + 1) || return 1 &&
j=$(expr $j + 1) || return 1
done
@@ -114,7 +114,7 @@ test_expect_success 'Add more packs' '
test_expect_success 'write midx with twelve packs' '
git multi-pack-index --object-dir=. write &&
- midx_read_expect
+ midx_read_expect 12
'
test_done
--
2.18.0.24.g1b579a2ee9
