Merge branch 'rs/maint-config-use-labs' into maint

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index b6a711d3191a729e5f07aae20e3fc5343148c9b2..29fb3f1c201682674f8a473c235dd2f1f539f287 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -13,7 +13,7 @@ static int check_symref(const char *HEAD, int quiet, int shorten, int print)
 {
        unsigned char sha1[20];
        int flag;
-       const char *refname = resolve_ref_unsafe(HEAD, sha1, 0, &flag);
+       const char *refname = resolve_ref_unsafe(HEAD, 0, sha1, &flag);
 
        if (!refname)
                die("No such ref: %s", HEAD);