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

[PATCH v19 15/48] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 19, 2014, 15:52 UTC
Message-ID
<1403193210-6028-16-git-send-email-sahlberg@google.com>
In-Reply-To
<1403193210-6028-1-git-send-email-sahlberg@google.com>

Make ref_update_reject_duplicates return any error that occurs through a new strbuf argument. This means that when a transaction commit fails in this function we will now be able to pass a helpful error message back to the caller.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index 61570c9..115f143 100644
--- a/refs.c
+++ b/refs.c
@@ -3488,6 +3488,7 @@ static int ref_update_compare(const void *r1, const void *r2)
 }
 
 static int ref_update_reject_duplicates(struct ref_update **updates, int n,
+					struct strbuf *err,
 					enum action_on_err onerr)
 {
 	int i;
@@ -3495,6 +3496,9 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
 		if (!strcmp(updates[i - 1]->refname, updates[i]->refname)) {
 			const char *str =
 				"Multiple updates for ref '%s' not allowed.";
+			if (err)
+				strbuf_addf(err, str, updates[i]->refname);
+
 			switch (onerr) {
 			case UPDATE_REFS_MSG_ON_ERR:
 				error(str, updates[i]->refname); break;
@@ -3525,7 +3529,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 
 	/* Copy, sort, and reject duplicate refs */
 	qsort(updates, n, sizeof(*updates), ref_update_compare);
-	ret = ref_update_reject_duplicates(updates, n, onerr);
+	ret = ref_update_reject_duplicates(updates, n, err, onerr);
 	if (ret)
 		goto cleanup;
 

-- 
2.0.0.438.g337c581
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 16 of 49 in “Use ref transactions”
  1. 00/48 Use ref transactionsRonnie Sahlberg, Jun 19, 2014
  2. 01/48 refs.c: remove ref_transaction_rollbackRonnie Sahlberg, Jun 19, 2014
  3. 02/48 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Jun 19, 2014
  4. 03/48 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Jun 19, 2014
  5. 04/48 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Jun 19, 2014
  6. 05/48 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Jun 19, 2014
  7. 06/48 lockfile.c: add a new public function unable_to_lock_messageRonnie Sahlberg, Jun 19, 2014
  8. 07/48 lockfile.c: make lock_file return a meaningful errno on failureiRonnie Sahlberg, Jun 19, 2014
  9. 08/48 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, Jun 19, 2014
  10. 09/48 refs.c: make sure log_ref_setup returns a meaningful errnoRonnie Sahlberg, Jun 19, 2014
  11. 10/48 refs.c: verify_lock should set errno to something meaningfulRonnie Sahlberg, Jun 19, 2014
  12. 11/48 refs.c: make remove_empty_directories always set errno to something saneRonnie Sahlberg, Jun 19, 2014
  13. 12/48 refs.c: commit_packed_refs to return a meaningful errno on failureRonnie Sahlberg, Jun 19, 2014
  14. 13/48 refs.c: make resolve_ref_unsafe set errno to something meaningful on errorRonnie Sahlberg, Jun 19, 2014
  15. 14/48 refs.c: log_ref_write should try to return meaningful errnoRonnie Sahlberg, Jun 19, 2014
  16. 15/48 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Jun 19, 2014
  17. 16/48 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Jun 19, 2014
  18. 17/48 update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg, Jun 19, 2014
  19. 18/48 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Jun 19, 2014
  20. 19/48 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Jun 19, 2014
  21. 20/48 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Jun 19, 2014
  22. 21/48 refs.c: update ref_transaction_delete to check for error and return statusRonnie Sahlberg, Jun 19, 2014
  23. 22/48 refs.c: make ref_transaction_begin take an err argumentRonnie Sahlberg, Jun 19, 2014
  24. 23/48 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Jun 19, 2014
  25. 24/48 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Jun 19, 2014
  26. 25/48 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Jun 19, 2014
  27. 26/48 commit.c: use ref transactions for updatesRonnie Sahlberg, Jun 19, 2014
  28. 27/48 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Jun 19, 2014
  29. 28/48 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Jun 19, 2014
  30. 29/48 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Jun 19, 2014
  31. 30/48 refs.c: change update_ref to use a transactionRonnie Sahlberg, Jun 19, 2014
  32. 31/48 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Jun 19, 2014
  33. 32/48 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Jun 19, 2014
  34. 33/48 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Jun 19, 2014
  35. 34/48 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Jun 19, 2014
  36. 35/48 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Jun 19, 2014
  37. 36/48 refs.c: remove the update_ref_write functionRonnie Sahlberg, Jun 19, 2014
  38. 37/48 refs.c: remove lock_ref_sha1Ronnie Sahlberg, Jun 19, 2014
  39. 38/48 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, Jun 19, 2014
  40. 39/48 refs.c: make delete_ref use a transactionRonnie Sahlberg, Jun 19, 2014
  41. 40/48 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, Jun 19, 2014
  42. 41/48 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, Jun 19, 2014
  43. 42/48 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, Jun 19, 2014
  44. 43/48 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, Jun 19, 2014
  45. 44/48 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, Jun 19, 2014
  46. 45/48 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, Jun 19, 2014
  47. 46/48 refs.c: propagate any errno==ENOTDIR from _commit back to the callersRonnie Sahlberg, Jun 19, 2014
  48. 47/48 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Jun 19, 2014
  49. 48/48 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Jun 19, 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.