From: Justin Tobler <jltobler@gmail.com>
To: git@vger.kernel.org
Cc: ps@pks.im, gitster@pobox.com, Justin Tobler <jltobler@gmail.com>
Subject: [PATCH v2 2/4] object-file: rename transaction functions
Date: Mon, 2 Feb 2026 18:10:00 -0600 [thread overview]
Message-ID: <20260203001002.2500198-3-jltobler@gmail.com> (raw)
In-Reply-To: <20260203001002.2500198-1-jltobler@gmail.com>
In a subsequent commit, ODB transactions are made more generic to
facilitate each ODB source providing its own transaction handling.
Rename `object_file_transaction_{begin,commit}()` to
`odb_transaction_files_{begin,commit}()` to better match the future
source specific transaction implementation.
Signed-off-by: Justin Tobler <jltobler@gmail.com>
---
object-file.c | 6 +++---
object-file.h | 6 +++---
odb.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/object-file.c b/object-file.c
index 196509b252..7b34a2b274 100644
--- a/object-file.c
+++ b/object-file.c
@@ -723,7 +723,7 @@ static void prepare_loose_object_transaction(struct odb_transaction *transaction
* We lazily create the temporary object directory
* the first time an object might be added, since
* callers may not know whether any objects will be
- * added at the time they call object_file_transaction_begin.
+ * added at the time they call odb_transaction_files_begin.
*/
if (!transaction || transaction->objdir)
return;
@@ -1985,7 +1985,7 @@ int read_loose_object(struct repository *repo,
return ret;
}
-struct odb_transaction *object_file_transaction_begin(struct odb_source *source)
+struct odb_transaction *odb_transaction_files_begin(struct odb_source *source)
{
struct object_database *odb = source->odb;
@@ -1998,7 +1998,7 @@ struct odb_transaction *object_file_transaction_begin(struct odb_source *source)
return odb->transaction;
}
-void object_file_transaction_commit(struct odb_transaction *transaction)
+void odb_transaction_files_commit(struct odb_transaction *transaction)
{
if (!transaction)
return;
diff --git a/object-file.h b/object-file.h
index 1229d5f675..b4a3341a89 100644
--- a/object-file.h
+++ b/object-file.h
@@ -202,16 +202,16 @@ struct odb_transaction;
/*
* Tell the object database to optimize for adding
- * multiple objects. object_file_transaction_commit must be called
+ * multiple objects. odb_transaction_files_commit must be called
* to make new objects visible. If a transaction is already
* pending, NULL is returned.
*/
-struct odb_transaction *object_file_transaction_begin(struct odb_source *source);
+struct odb_transaction *odb_transaction_files_begin(struct odb_source *source);
/*
* Tell the object database to make any objects from the
* current transaction visible.
*/
-void object_file_transaction_commit(struct odb_transaction *transaction);
+void odb_transaction_files_commit(struct odb_transaction *transaction);
#endif /* OBJECT_FILE_H */
diff --git a/odb.c b/odb.c
index ac70b6a099..a5e6fd01a9 100644
--- a/odb.c
+++ b/odb.c
@@ -1153,10 +1153,10 @@ void odb_reprepare(struct object_database *o)
struct odb_transaction *odb_transaction_begin(struct object_database *odb)
{
- return object_file_transaction_begin(odb->sources);
+ return odb_transaction_files_begin(odb->sources);
}
void odb_transaction_commit(struct odb_transaction *transaction)
{
- object_file_transaction_commit(transaction);
+ odb_transaction_files_commit(transaction);
}
--
2.52.0.373.g68cb7f9e92
next prev parent reply other threads:[~2026-02-03 0:10 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-28 23:45 [PATCH 0/4] odb: support ODB source specific transaction handling Justin Tobler
2026-01-28 23:45 ` [PATCH 1/4] odb: store ODB source in `struct odb_transaction` Justin Tobler
2026-01-29 11:24 ` Patrick Steinhardt
2026-01-29 19:25 ` Junio C Hamano
2026-01-29 20:12 ` Justin Tobler
2026-01-29 20:28 ` Junio C Hamano
2026-01-29 21:54 ` Justin Tobler
2026-01-29 19:30 ` Justin Tobler
2026-01-28 23:45 ` [PATCH 2/4] object-file: rename transaction functions Justin Tobler
2026-01-28 23:45 ` [PATCH 3/4] odb: prepare `struct odb_transaction` to support more sources Justin Tobler
2026-01-29 11:24 ` Patrick Steinhardt
2026-01-29 19:41 ` Justin Tobler
2026-01-28 23:45 ` [PATCH 4/4] odb: transparently handle common transaction behavior Justin Tobler
2026-01-29 11:24 ` Patrick Steinhardt
2026-02-03 0:09 ` [PATCH v2 0/4] odb: support ODB source specific transaction handling Justin Tobler
2026-02-03 0:09 ` [PATCH v2 1/4] odb: store ODB source in `struct odb_transaction` Justin Tobler
2026-02-03 0:10 ` Justin Tobler [this message]
2026-02-03 0:10 ` [PATCH v2 3/4] odb: prepare `struct odb_transaction` to become generic Justin Tobler
2026-02-03 15:54 ` Toon Claes
2026-02-03 16:46 ` Justin Tobler
2026-02-03 22:54 ` Junio C Hamano
2026-02-04 6:26 ` Patrick Steinhardt
2026-02-04 17:15 ` Justin Tobler
2026-02-04 10:31 ` Karthik Nayak
2026-02-04 17:38 ` Justin Tobler
2026-02-05 11:20 ` Karthik Nayak
2026-02-03 0:10 ` [PATCH v2 4/4] odb: transparently handle common transaction behavior Justin Tobler
2026-02-04 10:34 ` Karthik Nayak
2026-02-04 17:50 ` Justin Tobler
2026-02-05 11:22 ` Karthik Nayak
2026-02-03 1:16 ` [PATCH v2 0/4] odb: support ODB source specific transaction handling Junio C Hamano
2026-02-04 6:25 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260203001002.2500198-3-jltobler@gmail.com \
--to=jltobler@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox