From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v7 29/42] refs.c: remove the update_ref_lock function
Date: Wed, 14 May 2014 14:17:03 -0700 [thread overview]
Message-ID: <1400102236-30082-30-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1400102236-30082-1-git-send-email-sahlberg@google.com>
Since we now only call update_ref_lock with onerr==QUIET_ON_ERR we no longer
need this function and can replace it with just calling lock_any_ref_for_update
directly.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/refs.c b/refs.c
index 38193f1..81ba33c 100644
--- a/refs.c
+++ b/refs.c
@@ -3244,24 +3244,6 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
return retval;
}
-static struct ref_lock *update_ref_lock(const char *refname,
- const unsigned char *oldval,
- int flags, int *type_p,
- enum action_on_err onerr)
-{
- struct ref_lock *lock;
- lock = lock_any_ref_for_update(refname, oldval, flags, type_p);
- if (!lock) {
- const char *str = "Cannot lock the ref '%s'.";
- switch (onerr) {
- case UPDATE_REFS_MSG_ON_ERR: error(str, refname); break;
- case UPDATE_REFS_DIE_ON_ERR: die(str, refname); break;
- case UPDATE_REFS_QUIET_ON_ERR: break;
- }
- }
- return lock;
-}
-
static int update_ref_write(const char *action, const char *refname,
const unsigned char *sha1, struct ref_lock *lock,
struct strbuf *err, enum action_on_err onerr)
@@ -3505,12 +3487,12 @@ int ref_transaction_commit(struct ref_transaction *transaction,
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
- update->lock = update_ref_lock(update->refname,
- (update->have_old ?
- update->old_sha1 : NULL),
- update->flags,
- &update->type,
- UPDATE_REFS_QUIET_ON_ERR);
+ update->lock = lock_any_ref_for_update(update->refname,
+ (update->have_old ?
+ update->old_sha1 :
+ NULL),
+ update->flags,
+ &update->type);
if (!update->lock) {
if (err)
strbuf_addf(err, "Cannot lock the ref '%s'.",
--
2.0.0.rc3.471.g2055d11.dirty
next prev parent reply other threads:[~2014-05-14 21:19 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-14 21:16 [PATCH v7 00/42] Use ref transactions for all ref updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 01/42] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 02/42] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 03/42] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 04/42] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 05/42] update-ref.c: log transaction error from the update_ref Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 06/42] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 07/42] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 08/42] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 09/42] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 10/42] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 11/42] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 12/42] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 13/42] commit.c: use ref transactions " Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 14/42] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 15/42] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 16/42] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 17/42] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 18/42] refs.c: free the transaction before returning when number of updates is 0 Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 19/42] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 20/42] fetch.c: clear errno before calling functions that might set it Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 21/42] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 22/42] fetch.c: use a single ref transaction for all ref updates Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 23/42] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 24/42] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-05-14 21:16 ` [PATCH v7 25/42] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 26/42] refs.c: make write_ref_sha1 static Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 27/42] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 28/42] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-05-14 21:17 ` Ronnie Sahlberg [this message]
2014-05-14 21:17 ` [PATCH v7 30/42] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 31/42] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 32/42] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 33/42] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 34/42] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 35/42] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 36/42] refs.c: pack all refs before we start to rename a ref Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 37/42] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 38/42] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 39/42] refs.c: add a new flag for transaction delete for refs we know are packed only Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 40/42] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 41/42] refs.c: make rename_ref use a transaction Ronnie Sahlberg
2014-05-14 21:17 ` [PATCH v7 42/42] refs.c: remove forward declaration of write_ref_sha1 Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400102236-30082-30-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).