diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-02 12:26:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-02 12:26:11 -0700 |
| commit | fd13909eb63ef121824f243183db6b1f49ef1aed (patch) | |
| tree | 9a70143dbea20d9464bf48cecd287ee484171690 /builtin/unpack-objects.c | |
| parent | The thirteenth batcn (diff) | |
| parent | odb: add transaction interface (diff) | |
| download | git-fd13909eb63ef121824f243183db6b1f49ef1aed.tar.gz git-fd13909eb63ef121824f243183db6b1f49ef1aed.zip | |
Merge branch 'jt/odb-transaction'
The work to build on the bulk-checkin infrastructure to create many
objects at once in a transaction and to abstract it into the
generic object layer continues.
* jt/odb-transaction:
odb: add transaction interface
object-file: update naming from bulk-checkin
object-file: relocate ODB transaction code
bulk-checkin: drop flush_odb_transaction()
builtin/update-index: end ODB transaction when --verbose is specified
bulk-checkin: remove ODB transaction nesting
Diffstat (limited to 'builtin/unpack-objects.c')
| -rw-r--r-- | builtin/unpack-objects.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 28124b324d..ef79e43715 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -2,7 +2,6 @@ #define DISABLE_SIGN_COMPARE_WARNINGS #include "builtin.h" -#include "bulk-checkin.h" #include "config.h" #include "environment.h" #include "gettext.h" @@ -600,12 +599,12 @@ static void unpack_all(void) progress = start_progress(the_repository, _("Unpacking objects"), nr_objects); CALLOC_ARRAY(obj_list, nr_objects); - transaction = begin_odb_transaction(the_repository->objects); + transaction = odb_transaction_begin(the_repository->objects); for (i = 0; i < nr_objects; i++) { unpack_one(i); display_progress(progress, i + 1); } - end_odb_transaction(transaction); + odb_transaction_commit(transaction); stop_progress(&progress); if (delta_list) |