git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v21 16/19] refs.c: make update_ref_write update a strbuf on failure

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jul 14, 2014, 20:58 UTC
Message-ID
<1405371541-32121-17-git-send-email-sahlberg@google.com>
In-Reply-To
<1405371541-32121-1-git-send-email-sahlberg@google.com>

Change update_ref_write to also update an error strbuf on failure. This makes the error available to ref_transaction_commit callers if the transaction failed due to update_ref_sha1/write_ref_sha1 failures.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/refs.c b/refs.c
index 115f143..003b313 100644
--- a/refs.c
+++ b/refs.c
@@ -3353,10 +3353,13 @@ static struct ref_lock *update_ref_lock(const char *refname,
 
 static int update_ref_write(const char *action, const char *refname,
 			    const unsigned char *sha1, struct ref_lock *lock,
-			    enum action_on_err onerr)
+			    struct strbuf *err, enum action_on_err onerr)
 {
 	if (write_ref_sha1(lock, sha1, action) < 0) {
 		const char *str = "Cannot update the ref '%s'.";
+		if (err)
+			strbuf_addf(err, str, refname);
+
 		switch (onerr) {
 		case UPDATE_REFS_MSG_ON_ERR: error(str, refname); break;
 		case UPDATE_REFS_DIE_ON_ERR: die(str, refname); break;
@@ -3477,7 +3480,7 @@ int update_ref(const char *action, const char *refname,
 	lock = update_ref_lock(refname, oldval, flags, NULL, onerr);
 	if (!lock)
 		return 1;
-	return update_ref_write(action, refname, sha1, lock, onerr);
+	return update_ref_write(action, refname, sha1, lock, NULL, onerr);
 }
 
 static int ref_update_compare(const void *r1, const void *r2)
@@ -3559,7 +3562,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 			ret = update_ref_write(msg,
 					       update->refname,
 					       update->new_sha1,
-					       update->lock, onerr);
+					       update->lock, err, onerr);
 			update->lock = NULL; /* freed by update_ref_write */
 			if (ret)
 				goto cleanup;

-- 
2.0.1.546.gf603308
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 17 of 20 in “Use ref transactions”
  1. 00/19 Use ref transactionsRonnie Sahlberg, Jul 14, 2014
  2. 01/19 refs.c: remove ref_transaction_rollbackRonnie Sahlberg, Jul 14, 2014
  3. 02/19 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Jul 14, 2014
  4. 03/19 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Jul 14, 2014
  5. 04/19 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Jul 14, 2014
  6. 05/19 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Jul 14, 2014
  7. 06/19 lockfile.c: add a new public function unable_to_lock_messageRonnie Sahlberg, Jul 14, 2014
  8. 07/19 lockfile.c: make lock_file return a meaningful errno on failureRonnie Sahlberg, Jul 14, 2014
  9. 08/19 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, Jul 14, 2014
  10. 09/19 refs.c: make sure log_ref_setup returns a meaningful errnoRonnie Sahlberg, Jul 14, 2014
  11. 10/19 refs.c: verify_lock should set errno to something meaningfulRonnie Sahlberg, Jul 14, 2014
  12. 11/19 refs.c: make remove_empty_directories always set errno to something saneRonnie Sahlberg, Jul 14, 2014
  13. 12/19 refs.c: commit_packed_refs to return a meaningful errno on failureRonnie Sahlberg, Jul 14, 2014
  14. 13/19 refs.c: make resolve_ref_unsafe set errno to something meaningful on errorRonnie Sahlberg, Jul 14, 2014
  15. 14/19 refs.c: log_ref_write should try to return meaningful errnoRonnie Sahlberg, Jul 14, 2014
  16. 15/19 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Jul 14, 2014
  17. 16/19 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Jul 14, 2014
  18. 17/19 update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg, Jul 14, 2014
  19. 18/19 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Jul 14, 2014
  20. 19/19 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Jul 14, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.