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

[PATCH v21 18/19] refs.c: remove the onerr argument to ref_transaction_commit

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

Since all callers now use QUIET_ON_ERR we no longer need to provide an onerr argument any more. Remove the onerr argument from the ref_transaction_commit signature.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/update-ref.c |  3 +--
 refs.c               | 22 +++++++---------------
 refs.h               |  3 +--
 3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index aec9004..88ab785 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -366,8 +366,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 		if (end_null)
 			line_termination = '\0';
 		update_refs_stdin();
-		if (ref_transaction_commit(transaction, msg, &err,
-					   UPDATE_REFS_QUIET_ON_ERR))
+		if (ref_transaction_commit(transaction, msg, &err))
 			die("%s", err.buf);
 		ref_transaction_free(transaction);
 		return 0;
diff --git a/refs.c b/refs.c
index 003b313..4f78bd9 100644
--- a/refs.c
+++ b/refs.c
@@ -3491,8 +3491,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)
+					struct strbuf *err)
 {
 	int i;
 	for (i = 1; i < n; i++)
@@ -3502,22 +3501,13 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
 			if (err)
 				strbuf_addf(err, str, updates[i]->refname);
 
-			switch (onerr) {
-			case UPDATE_REFS_MSG_ON_ERR:
-				error(str, updates[i]->refname); break;
-			case UPDATE_REFS_DIE_ON_ERR:
-				die(str, updates[i]->refname); break;
-			case UPDATE_REFS_QUIET_ON_ERR:
-				break;
-			}
 			return 1;
 		}
 	return 0;
 }
 
 int ref_transaction_commit(struct ref_transaction *transaction,
-			   const char *msg, struct strbuf *err,
-			   enum action_on_err onerr)
+			   const char *msg, struct strbuf *err)
 {
 	int ret = 0, delnum = 0, i;
 	const char **delnames;
@@ -3532,7 +3522,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, err, onerr);
+	ret = ref_update_reject_duplicates(updates, n, err);
 	if (ret)
 		goto cleanup;
 
@@ -3544,7 +3534,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 					       (update->have_old ?
 						update->old_sha1 : NULL),
 					       update->flags,
-					       &update->type, onerr);
+					       &update->type,
+					       UPDATE_REFS_QUIET_ON_ERR);
 		if (!update->lock) {
 			if (err)
 				strbuf_addf(err, "Cannot lock the ref '%s'.",
@@ -3562,7 +3553,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 			ret = update_ref_write(msg,
 					       update->refname,
 					       update->new_sha1,
-					       update->lock, err, onerr);
+					       update->lock, err,
+					       UPDATE_REFS_QUIET_ON_ERR);
 			update->lock = NULL; /* freed by update_ref_write */
 			if (ret)
 				goto cleanup;
diff --git a/refs.h b/refs.h
index e588ff8..163b45c 100644
--- a/refs.h
+++ b/refs.h
@@ -282,8 +282,7 @@ void ref_transaction_delete(struct ref_transaction *transaction,
  * the transaction failed. The string does not end in newline.
  */
 int ref_transaction_commit(struct ref_transaction *transaction,
-			   const char *msg, struct strbuf *err,
-			   enum action_on_err onerr);
+			   const char *msg, struct strbuf *err);
 
 /*
  * Free an existing transaction and all associated data.

-- 
2.0.1.546.gf603308
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 19 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.