[PATCH 18/20] refs.c: remove lock_ref_sha1
flat view
STALE3766d
REVIEWED: 1 (0M)
From: Jonathan Nieder <hidden>
Date: 2016-06-15 23:02:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
1 review trailer.
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 18/20] refs.c: remove lock_ref_sha1 · Ronnie Sahlberg <hidden>
From: Ronnie Sahlberg <redacted> Date: Tue, 29 Apr 2014 15:45:52 -0700 lock_ref_sha1 was only called from one place in refs.c and only provided a check that the refname was sane before adding back the initial "refs/" part of the ref path name, the initial "refs/" that this caller had already stripped off before calling lock_ref_sha1. Signed-off-by: Ronnie Sahlberg <redacted> Reviewed-by: Michael Haggerty <redacted> Signed-off-by: Jonathan Nieder <redacted> --- refs.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c
index ef7660a..f0883d0 100644
--- a/refs.c
+++ b/refs.c@@ -2173,15 +2173,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, return NULL; } -static struct ref_lock *lock_ref_sha1(const char *refname, const unsigned char *old_sha1) -{ - char refpath[PATH_MAX]; - if (check_refname_format(refname, 0)) - return NULL; - strcpy(refpath, mkpath("refs/%s", refname)); - return lock_ref_sha1_basic(refpath, old_sha1, 0, NULL); -} - struct ref_lock *lock_any_ref_for_update(const char *refname, const unsigned char *old_sha1, int flags, int *type_p)
@@ -2391,8 +2382,12 @@ static void try_remove_empty_parents(char *name) /* make sure nobody touched the ref, and unlink */ static void prune_ref(struct ref_to_prune *r) { - struct ref_lock *lock = lock_ref_sha1(r->name + 5, r->sha1); + struct ref_lock *lock; + if (check_refname_format(r->name + 5, 0)) + return; + + lock = lock_ref_sha1_basic(r->name, r->sha1, 0, NULL); if (lock) { unlink_or_warn(git_path("%s", r->name)); unlock_ref(lock);
--
2.1.0.rc2.206.gedb03e5