Merge branch 'master'

diff --git a/symbolic-ref.c b/symbolic-ref.c
index af087d211de32786120882f89a63f94a3e699d98..a72d7accb18092231c608a6ae7db4a4ce9dc8b73 100644 (file)
--- a/symbolic-ref.c
+++ b/symbolic-ref.c
@@ -3,7 +3,7 @@
 static const char git_symbolic_ref_usage[] =
 "git-symbolic-ref name [ref]";
 
-static int check_symref(const char *HEAD)
+static void check_symref(const char *HEAD)
 {
        unsigned char sha1[20];
        const char *git_HEAD = strdup(git_path("%s", HEAD));