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

[PATCH v15 08/48] refs.c: add an err argument to repack_without_refs

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 10, 2014, 22:28 UTC
Message-ID
<1402439376-25839-9-git-send-email-sahlberg@google.com>
In-Reply-To
<1402439376-25839-1-git-send-email-sahlberg@google.com>

Update repack_without_refs to take an err argument and update it if there is a failure. Pass the err variable from ref_transaction_commit to this function so that callers can print a meaningful error message if _commit fails due to this function.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index 1e8f293..b4b05bd 100644
--- a/refs.c
+++ b/refs.c
@@ -2428,12 +2428,12 @@ static int curate_packed_ref_fn(struct ref_entry *entry, void *cb_data)
 	return 0;
 }
 
-static int repack_without_refs(const char **refnames, int n)
+static int repack_without_refs(const char **refnames, int n, struct strbuf *err)
 {
 	struct ref_dir *packed;
 	struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
 	struct string_list_item *ref_to_delete;
-	int i, removed = 0;
+	int i, ret, removed = 0;
 
 	/* Look for a packed ref */
 	for (i = 0; i < n; i++)
@@ -2445,6 +2445,11 @@ static int repack_without_refs(const char **refnames, int n)
 		return 0; /* no refname exists in packed refs */
 
 	if (lock_packed_refs(0)) {
+		if (err) {
+			unable_to_lock_message(git_path("packed-refs"), errno,
+					       err);
+			return -1;
+		}
 		unable_to_lock_error(git_path("packed-refs"), errno);
 		return error("cannot delete '%s' from packed refs", refnames[i]);
 	}
@@ -2471,12 +2476,16 @@ static int repack_without_refs(const char **refnames, int n)
 	}
 
 	/* Write what remains */
-	return commit_packed_refs();
+	ret = commit_packed_refs();
+	if (ret && err)
+		strbuf_addf(err, "unable to overwrite old ref-pack file: %s",
+			    strerror(errno));
+	return ret;
 }
 
 static int repack_without_ref(const char *refname)
 {
-	return repack_without_refs(&refname, 1);
+	return repack_without_refs(&refname, 1, NULL);
 }
 
 static int delete_ref_loose(struct ref_lock *lock, int flag)
@@ -3482,7 +3491,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 		}
 	}
 
-	ret |= repack_without_refs(delnames, delnum);
+	ret |= repack_without_refs(delnames, delnum, err);
 	for (i = 0; i < delnum; i++)
 		unlink_or_warn(git_path("logs/%s", delnames[i]));
 	clear_loose_ref_cache(&ref_cache);

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