aboutsummaryrefslogtreecommitdiffstats
path: root/odb.h
diff options
context:
space:
mode:
authorJustin Tobler <jltobler@gmail.com>2025-08-22 16:34:58 -0500
committerJunio C Hamano <gitster@pobox.com>2025-08-25 09:48:13 -0700
commitb3361447256bb92a1dbdda910a33cfb1d6fc8f88 (patch)
treed6d52cf269972a5950dc7aac44204e2a16d274bb /odb.h
parent98518304c5761ba04cefb6d73c5698db7e46d1c2 (diff)
downloadgit-b3361447256bb92a1dbdda910a33cfb1d6fc8f88.tar.gz
bulk-checkin: remove global transaction state
Object database transactions in the bulk-checkin subsystem rely on global state to track transaction status. Stop relying on global state and instead store the transaction in the `struct object_database`. Functions that operate on transactions are updated to now wire transaction state. Signed-off-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'odb.h')
-rw-r--r--odb.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/odb.h b/odb.h
index 3dfc66d75a..a89b214390 100644
--- a/odb.h
+++ b/odb.h
@@ -84,6 +84,7 @@ struct odb_source {
struct packed_git;
struct cached_object_entry;
+struct odb_transaction;
/*
* The object database encapsulates access to objects in a repository. It
@@ -95,6 +96,13 @@ struct object_database {
struct repository *repo;
/*
+ * State of current current object database transaction. Only one
+ * transaction may be pending at a time. Is NULL when no transaction is
+ * configured.
+ */
+ struct odb_transaction *transaction;
+
+ /*
* Set of all object directories; the main directory is first (and
* cannot be NULL after initialization). Subsequent directories are
* alternates.