diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-15 08:52:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-15 08:52:05 -0700 |
| commit | 7d00521d7be21ca4a3713b2fa367eb7296212e09 (patch) | |
| tree | 7eb6850b179d543a59177c8363ec90dc0768fce8 /builtin/unpack-objects.c | |
| parent | 92c87bdc406e5bcf1b516a861d609b03d99c23b7 (diff) | |
| parent | ddc0b56ad77d7c86145a6a1774f05f9d11bf2337 (diff) | |
| download | git-7d00521d7be21ca4a3713b2fa367eb7296212e09.tar.xz | |
Merge branch 'jt/de-global-bulk-checkin'
The bulk-checkin code used to depend on a file-scope static
singleton variable, which has been updated to pass an instance
throughout the callchain.
* jt/de-global-bulk-checkin:
bulk-checkin: use repository variable from transaction
bulk-checkin: require transaction for index_blob_bulk_checkin()
bulk-checkin: remove global transaction state
bulk-checkin: introduce object database transaction structure
Diffstat (limited to 'builtin/unpack-objects.c')
| -rw-r--r-- | builtin/unpack-objects.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 7ae7c82b6c..28124b324d 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -584,6 +584,7 @@ static void unpack_all(void) { int i; unsigned char *hdr = fill(sizeof(struct pack_header)); + struct odb_transaction *transaction; if (get_be32(hdr) != PACK_SIGNATURE) die("bad pack file"); @@ -599,12 +600,12 @@ static void unpack_all(void) progress = start_progress(the_repository, _("Unpacking objects"), nr_objects); CALLOC_ARRAY(obj_list, nr_objects); - begin_odb_transaction(); + transaction = begin_odb_transaction(the_repository->objects); for (i = 0; i < nr_objects; i++) { unpack_one(i); display_progress(progress, i + 1); } - end_odb_transaction(); + end_odb_transaction(transaction); stop_progress(&progress); if (delta_list) |