Imported Upstream version 2.10.1

[platform/upstream/git.git] / builtin / symbolic-ref.c

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 801d62e..96eed94 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -4,17 +4,16 @@
 #include "parse-options.h"
 
 static const char * const git_symbolic_ref_usage[] = {
-       "git symbolic-ref [options] name [ref]",
+       N_("git symbolic-ref [<options>] <name> [<ref>]"),
+       N_("git symbolic-ref -d [-q] <name>"),
        NULL
 };
 
-static int shorten;
-
-static void check_symref(const char *HEAD, int quiet)
+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);
@@ -22,42 +21,58 @@ static void check_symref(const char *HEAD, int quiet)
                if (!quiet)
                        die("ref %s is not a symbolic ref", HEAD);
                else
-                       exit(1);
+                       return 1;
+       }
+       if (print) {
+               if (shorten)
+                       refname = shorten_unambiguous_ref(refname, 0);
+               puts(refname);
        }
-       if (shorten)
-               refname = shorten_unambiguous_ref(refname, 0);
-       puts(refname);
+       return 0;
 }
 
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 {
-       int quiet = 0;
+       int quiet = 0, delete = 0, shorten = 0, ret = 0;
        const char *msg = NULL;
        struct option options[] = {
                OPT__QUIET(&quiet,
-                       "suppress error message for non-symbolic (detached) refs"),
-               OPT_BOOL(0, "short", &shorten, "shorten ref output"),
-               OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
+                       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_STRING('m', NULL, &msg, N_("reason"), N_("reason of the update")),
                OPT_END(),
        };
 
        git_config(git_default_config, NULL);
        argc = parse_options(argc, argv, prefix, options,
                             git_symbolic_ref_usage, 0);
-       if (msg &&!*msg)
+       if (msg && !*msg)
                die("Refusing to perform update with empty message");
+
+       if (delete) {
+               if (argc != 1)
+                       usage_with_options(git_symbolic_ref_usage, options);
+               ret = check_symref(argv[0], 1, 0, 0);
+               if (ret)
+                       die("Cannot delete %s, not a symbolic ref", argv[0]);
+               if (!strcmp(argv[0], "HEAD"))
+                       die("deleting '%s' is not allowed", argv[0]);
+               return delete_ref(argv[0], NULL, REF_NODEREF);
+       }
+
        switch (argc) {
        case 1:
-               check_symref(argv[0], quiet);
+               ret = check_symref(argv[0], quiet, shorten, 1);
                break;
        case 2:
                if (!strcmp(argv[0], "HEAD") &&
-                   prefixcmp(argv[1], "refs/"))
+                   !starts_with(argv[1], "refs/"))
                        die("Refusing to point HEAD outside of refs/");
-               create_symref(argv[0], argv[1], msg);
+               ret = !!create_symref(argv[0], argv[1], msg);
                break;
        default:
                usage_with_options(git_symbolic_ref_usage, options);
        }
-       return 0;
+       return ret;
 }