aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-19 09:10:38 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-19 09:10:38 -0700
commit8090c08e1e90274d35bbf06238d2933759f3a1bb (patch)
tree45ad709ea88fbdfe53a2614057cbb69f0b75033b
parentff62b7f37899de2faa88cbb5be1f3bcfa246012c (diff)
parent70e1a880a3dc3648fbed463044358a4a83116743 (diff)
downloadgit-8090c08e1e90274d35bbf06238d2933759f3a1bb.tar.gz
git-8090c08e1e90274d35bbf06238d2933759f3a1bb.tar.xz
Merge early part of 'sp/reflog' branch
-rw-r--r--refs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/refs.c b/refs.c
index 6c91ae646..0f3491f87 100644
--- a/refs.c
+++ b/refs.c
@@ -220,12 +220,9 @@ static char *ref_lock_file_name(const char *ref)
int get_ref_sha1(const char *ref, unsigned char *sha1)
{
- const char *filename;
-
if (check_ref_format(ref))
return -1;
- filename = git_path("refs/%s", ref);
- return read_ref(filename, sha1);
+ return read_ref(git_path("refs/%s", ref), sha1);
}
static int lock_ref_file(const char *filename, const char *lock_filename,