Git development
 help / color / mirror / Atom feed
From: Justin Tobler <jltobler@gmail.com>
To: git@vger.kernel.org
Cc: ps@pks.im, karthik.188@gmail.com, Justin Tobler <jltobler@gmail.com>
Subject: [PATCH v2 5/6] odb/transaction: avoid "ODB" in error messages
Date: Wed, 18 Nov 2026 18:20:42 -0600	[thread overview]
Message-ID: <20261119002043.2108654-6-jltobler@gmail.com> (raw)
In-Reply-To: <20261119002043.2108654-1-jltobler@gmail.com>

When starting, committing, or finalizing an ODB transaction fails, the
`odb_transaction_begin_or_die()` and
`odb_transaction_commit_and_finalize_or_die()` helpers die with a
message referring to an "ODB transaction". The term "ODB" is unlikely to
be understood by the average user though.

Refer to an "object transaction" in these messages instead.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
---
 odb/transaction.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odb/transaction.h b/odb/transaction.h
index 2a40c85bc8..f6c4b523cd 100644
--- a/odb/transaction.h
+++ b/odb/transaction.h
@@ -125,7 +125,7 @@ static inline void odb_transaction_begin_or_die(struct object_database *odb,
 						enum odb_transaction_flags flags)
 {
 	if (odb_transaction_begin(odb, out, flags))
-		die(_("failed to start ODB transaction"));
+		die(_("failed to start object transaction"));
 }
 
 /*
@@ -146,9 +146,9 @@ int odb_transaction_finalize(struct odb_transaction *transaction);
 static inline void odb_transaction_commit_and_finalize_or_die(struct odb_transaction *transaction)
 {
 	if (odb_transaction_commit(transaction))
-		die(_("failed to commit ODB transaction"));
+		die(_("failed to commit object transaction"));
 	if (odb_transaction_finalize(transaction))
-		die(_("failed to finalize ODB transaction"));
+		die(_("failed to finalize object transaction"));
 }
 
 /*
-- 
2.56.0.173.gf57c9a7388


  parent reply	other threads:[~2026-11-19  0:20 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10  0:22 [PATCH 0/4] object-file: eagerly create ODB transaction temporary directory Justin Tobler
2026-11-10  0:22 ` [PATCH 1/4] object-file: rename default transaction prefix Justin Tobler
2026-11-11 13:15   ` Patrick Steinhardt
2026-11-11 14:36   ` Karthik Nayak
2026-11-10  0:22 ` [PATCH 2/4] object-file: only flush batched fsync writes when enabled Justin Tobler
2026-11-11 13:16   ` Patrick Steinhardt
2026-11-17 23:35     ` Justin Tobler
2026-11-11 14:48   ` Karthik Nayak
2026-11-17 23:42     ` Justin Tobler
2026-11-10  0:22 ` [PATCH 3/4] tmp-objdir: preserve errno when directory creation fails Justin Tobler
2026-11-11 13:16   ` Patrick Steinhardt
2026-11-11 16:44   ` Karthik Nayak
2026-11-17 23:46     ` Justin Tobler
2026-11-10  0:22 ` [PATCH 4/4] object-file: create ODB transaction temporary directory eagerly Justin Tobler
2026-11-11 13:15   ` Patrick Steinhardt
2026-11-17 23:48     ` Justin Tobler
2026-11-11 16:48   ` Karthik Nayak
2026-11-17 23:57     ` Justin Tobler
2026-11-11 14:33 ` [PATCH 0/4] object-file: eagerly create ODB transaction temporary directory Karthik Nayak
2026-11-19  0:20 ` [PATCH v2 0/6] " Justin Tobler
2026-11-19  0:20   ` [PATCH v2 1/6] object-file: rename default transaction prefix Justin Tobler
2026-11-19  0:20   ` [PATCH v2 2/6] object-file: only flush batched fsync writes when enabled Justin Tobler
2026-11-19  0:20   ` [PATCH v2 3/6] tmp-objdir: inline `setup_tmp_objdir()` Justin Tobler
2026-11-19  0:20   ` [PATCH v2 4/6] tmp-objdir: preserve errno when directory creation fails Justin Tobler
2026-11-19  0:20   ` Justin Tobler [this message]
2026-11-19  0:20   ` [PATCH v2 6/6] object-file: create ODB transaction temporary directory eagerly Justin Tobler

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=20261119002043.2108654-6-jltobler@gmail.com \
    --to=jltobler@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=karthik.188@gmail.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