From: Justin Tobler Date: Thu, 19 Nov 2026 00:20:42 GMT Subject: [PATCH v2 5/6] odb/transaction: avoid "ODB" in error messages Message-ID: <20261119002043.2108654-6-jltobler@gmail.com> 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 --- 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