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

[PATCH v13 08/41] refs.c: add an err argument to delete_ref_loose

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 3, 2014, 21:37 UTC
Message-ID
<1401831479-3388-9-git-send-email-sahlberg@google.com>
In-Reply-To
<1401831479-3388-1-git-send-email-sahlberg@google.com>

Add an err argument to delete_loose_ref so that we can pass a descriptive error string back to the caller. Pass the err argument from transaction commit to this function so that transaction users will have a nice error string if the transaction failed due to delete_loose_ref.

Add a new function unlink_or_err that we can call from delete_ref_loose. This function is similar to unlink_or_warn except that we can pass it an err argument. If err is non-NULL the function will populate err instead of printing a warning().

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index 2d6941b..dd498cf 100644
--- a/refs.c
+++ b/refs.c
@@ -2510,16 +2510,38 @@ static int repack_without_ref(const char *refname)
 	return repack_without_refs(&refname, 1, NULL);
 }
 
-static int delete_ref_loose(struct ref_lock *lock, int flag)
+static int add_err_if_unremovable(const char *op, const char *file,
+				  struct strbuf *e, int rc)
+{
+	int err = errno;
+	if (rc < 0  && errno != ENOENT) {
+		strbuf_addf(e, "unable to %s %s: %s",
+			    op, file, strerror(errno));
+		errno = err;
+		return -1;
+	}
+	return 0;
+}
+
+static int unlink_or_err(const char *file, struct strbuf *err)
+{
+	if (err)
+		return add_err_if_unremovable("unlink", file, err,
+					      unlink(file));
+	else
+		return unlink_or_warn(file);
+}
+
+static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
 {
 	if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
 		/* loose */
-		int err, i = strlen(lock->lk->filename) - 5; /* .lock */
+		int res, i = strlen(lock->lk->filename) - 5; /* .lock */
 
 		lock->lk->filename[i] = 0;
-		err = unlink_or_warn(lock->lk->filename);
+		res = unlink_or_err(lock->lk->filename, err);
 		lock->lk->filename[i] = '.';
-		if (err && errno != ENOENT)
+		if (res && errno != ENOENT)
 			return 1;
 	}
 	return 0;
@@ -2533,7 +2555,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 	lock = lock_ref_sha1_basic(refname, sha1, delopt, &flag);
 	if (!lock)
 		return 1;
-	ret |= delete_ref_loose(lock, flag);
+	ret |= delete_ref_loose(lock, flag, NULL);
 
 	/* removing the loose one could have resurrected an earlier
 	 * packed one.  Also, if it was not loose we need to repack
@@ -3540,7 +3562,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 
 		if (update->lock) {
 			delnames[delnum++] = update->lock->ref_name;
-			ret |= delete_ref_loose(update->lock, update->type);
+			ret |= delete_ref_loose(update->lock, update->type,
+						err);
 		}
 	}
 

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