Merge branch 'jc/symbolic-ref-no-recurse'

[thirdparty/git.git] / builtin / symbolic-ref.c

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 1b0f10225f0c2630fab0f67534e7135b30571c66..590ed17dd3f52934ff5cd3bcdd4070ac3d015105 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -6,14 +6,17 @@
 
 static const char * const git_symbolic_ref_usage[] = {
        N_("git symbolic-ref [<options>] <name> [<ref>]"),
-       N_("git symbolic-ref -d [-q] <name>"),
+       N_("git symbolic-ref -d [-q] [--no-recurse] <name>"),
        NULL
 };
 
-static int check_symref(const char *HEAD, int quiet, int shorten, int print)
+static int check_symref(const char *HEAD, int quiet, int shorten, int recurse, int print)
 {
-       int flag;
-       const char *refname = resolve_ref_unsafe(HEAD, 0, NULL, &flag);
+       int resolve_flags, flag;
+       const char *refname;
+
+       resolve_flags = (recurse ? 0 : RESOLVE_REF_NO_RECURSE);
+       refname = resolve_ref_unsafe(HEAD, resolve_flags, NULL, &flag);
 
        if (!refname)
                die("No such ref: %s", HEAD);
@@ -35,13 +38,14 @@ static int check_symref(const char *HEAD, int quiet, int shorten, int print)
 
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 {
-       int quiet = 0, delete = 0, shorten = 0, ret = 0;
+       int quiet = 0, delete = 0, shorten = 0, recurse = 1, ret = 0;
        const char *msg = NULL;
        struct option options[] = {
                OPT__QUIET(&quiet,
                        N_("suppress error message for non-symbolic (detached) refs")),
                OPT_BOOL('d', "delete", &delete, N_("delete symbolic ref")),
                OPT_BOOL(0, "short", &shorten, N_("shorten ref output")),
+               OPT_BOOL(0, "recurse", &recurse, N_("recursively dereference (default)")),
                OPT_STRING('m', NULL, &msg, N_("reason"), N_("reason of the update")),
                OPT_END(),
        };
@@ -55,7 +59,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
        if (delete) {
                if (argc != 1)
                        usage_with_options(git_symbolic_ref_usage, options);
-               ret = check_symref(argv[0], 1, 0, 0);
+               ret = check_symref(argv[0], 1, 0, 0, 0);
                if (ret)
                        die("Cannot delete %s, not a symbolic ref", argv[0]);
                if (!strcmp(argv[0], "HEAD"))
@@ -65,7 +69,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 
        switch (argc) {
        case 1:
-               ret = check_symref(argv[0], quiet, shorten, 1);
+               ret = check_symref(argv[0], quiet, shorten, recurse, 1);
                break;
        case 2:
                if (!strcmp(argv[0], "HEAD") &&