[PATCH v12 36/41] refs.c: move the check for valid refname to lock_ref_sha1_basic
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- May 29, 2014, 16:07 UTC
- Message-ID
- <1401379676-9307-11-git-send-email-sahlberg@google.com>
- 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