git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v12 36/41] refs.c: move the check for valid refname to lock_ref_sha1_basic
Date: Thu, 29 May 2014 09:07:52 -0700	[thread overview]
Message-ID: <1401379676-9307-11-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1401379676-9307-1-git-send-email-sahlberg@google.com>

Move the check for check_refname_format from lock_any_ref_for_update
to lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely.

This leaves lock_any_ref_for_updates as a no-op wrapper which could be removed.
But this wrapper is also called from an external caller and we will soon
make changes to the signature to lock_ref_sha1_basic that we do not want to
expose to that caller.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/refs.c b/refs.c
index 5680028..df00993 100644
--- a/refs.c
+++ b/refs.c
@@ -2043,6 +2043,9 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
 	int missing = 0;
 	int attempts_remaining = 3;
 
+	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
+		return NULL;
+
 	lock = xcalloc(1, sizeof(struct ref_lock));
 	lock->lock_fd = -1;
 
@@ -2134,8 +2137,6 @@ struct ref_lock *lock_any_ref_for_update(const char *refname,
 					 const unsigned char *old_sha1,
 					 int flags, int *type_p)
 {
-	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
-		return NULL;
 	return lock_ref_sha1_basic(refname, old_sha1, flags, type_p);
 }
 
-- 
2.0.0.rc3.474.g3833130

  parent reply	other threads:[~2014-05-29 16:08 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-29 16:07 [PATCH v12 00/44] Use ref transactions for all ref updates Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 06/41] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-05-29 18:17   ` Jonathan Nieder
2014-06-03 20:55     ` Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 08/41] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 16/41] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 24/41] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 25/41] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 26/41] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 31/41] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 32/41] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 33/41] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-05-29 16:07 ` Ronnie Sahlberg [this message]
2014-05-29 16:07 ` [PATCH v12 38/41] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 39/41] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 40/41] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-05-29 16:07 ` [PATCH v12 41/41] refs.c: make write_ref_sha1 static Ronnie Sahlberg
2014-05-29 16:13 ` [PATCH v12 00/44] Use ref transactions for all ref updates 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=1401379676-9307-11-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /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).