summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/refs.c b/refs.c
index 40f16af..2cef2b4 100644
--- a/refs.c
+++ b/refs.c
@@ -447,9 +447,7 @@ static struct ref_lock *verify_lock(struct ref_lock *lock,
return lock;
}
-static struct ref_lock *lock_ref_sha1_basic(const char *ref,
- int plen,
- const unsigned char *old_sha1, int mustexist)
+static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char *old_sha1, int mustexist)
{
char *ref_file;
const char *orig_ref = ref;
@@ -472,7 +470,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *ref,
lock->ref_name = xstrdup(ref);
lock->log_file = xstrdup(git_path("logs/%s", ref));
- ref_file = git_path(ref);
+ ref_file = git_path("%s", ref);
lock->force_write = lstat(ref_file, &st) && errno == ENOENT;
if (safe_create_leading_directories(ref_file))
@@ -489,14 +487,13 @@ struct ref_lock *lock_ref_sha1(const char *ref,
if (check_ref_format(ref))
return NULL;
strcpy(refpath, mkpath("refs/%s", ref));
- return lock_ref_sha1_basic(refpath, strlen(refpath),
- old_sha1, mustexist);
+ return lock_ref_sha1_basic(refpath, old_sha1, mustexist);
}
struct ref_lock *lock_any_ref_for_update(const char *ref,
const unsigned char *old_sha1, int mustexist)
{
- return lock_ref_sha1_basic(ref, strlen(ref), old_sha1, mustexist);
+ return lock_ref_sha1_basic(ref, old_sha1, mustexist);
}
void unlock_ref(struct ref_lock *lock)