Sync with 1.7.8.3

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index ca855a5eb239f4dadccd53369e38db4e78b1d13f..2ef5962386dcc21af94c680be5fd75fc96d4962f 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -12,7 +12,7 @@ static void check_symref(const char *HEAD, int quiet)
 {
        unsigned char sha1[20];
        int flag;
-       const char *refs_heads_master = resolve_ref(HEAD, sha1, 0, &flag);
+       const char *refs_heads_master = resolve_ref_unsafe(HEAD, sha1, 0, &flag);
 
        if (!refs_heads_master)
                die("No such ref: %s", HEAD);
@@ -30,7 +30,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
        int quiet = 0;
        const char *msg = NULL;
        struct option options[] = {
-               OPT__QUIET(&quiet),
+               OPT__QUIET(&quiet,
+                       "suppress error message for non-symbolic (detached) refs"),
                OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
                OPT_END(),
        };