diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
| commit | 454b419729142cd65466cabdb253d06c3699d098 (patch) | |
| tree | 38647bbf5a1e1cd3600606596971559ac16bb063 /builtin | |
| parent | Merge branch 'en/unicode-in-refnames' (diff) | |
| parent | midx: add packs to packed_git linked list (diff) | |
| download | tgif-454b419729142cd65466cabdb253d06c3699d098.tar.xz | |
Merge branch 'ds/midx-too-many-packs'
The code to generate the multi-pack idx file was not prepared to
see too many packfiles and ran out of open file descriptor, which
has been corrected.
* ds/midx-too-many-packs:
midx: add packs to packed_git linked list
midx: pass a repository pointer
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/multi-pack-index.c | 2 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index ae6e476ad5..72dfd3dadc 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -46,7 +46,7 @@ int cmd_multi_pack_index(int argc, const char **argv, if (!strcmp(argv[0], "write")) return write_midx_file(opts.object_dir); if (!strcmp(argv[0], "verify")) - return verify_midx_file(opts.object_dir); + return verify_midx_file(the_repository, opts.object_dir); die(_("unrecognized verb: %s"), argv[0]); } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 9f424aabab..41d7fc5983 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1080,7 +1080,7 @@ static int want_object_in_pack(const struct object_id *oid, for (m = get_multi_pack_index(the_repository); m; m = m->next) { struct pack_entry e; - if (fill_midx_entry(oid, &e, m)) { + if (fill_midx_entry(the_repository, oid, &e, m)) { struct packed_git *p = e.p; off_t offset; |