Merge early part of 'sp/reflog' branch

diff --git a/refs.c b/refs.c
index 6c91ae6468f859897a358ebd97f4143e44cda874..0f3491f871bd692151b42307b833e633b041e948 100644 (file)
--- 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,