Windows: TMP and TEMP environment variables specify a temporary directory.

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

diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c
index 1d3a5e229ae1a16211671e7591a7544af98721f8..b49bdb6900f2c49b55880f9f220597bf3f156810 100644 (file)
--- a/builtin-symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -1,35 +1,53 @@
 #include "builtin.h"
 #include "cache.h"
+#include "refs.h"
+#include "parse-options.h"
 
-static const char git_symbolic_ref_usage[] =
-"git-symbolic-ref name [ref]";
+static const char * const git_symbolic_ref_usage[] = {
+       "git-symbolic-ref [options] name [ref]",
+       NULL
+};
 
-static void check_symref(const char *HEAD)
+static void check_symref(const char *HEAD, int quiet)
 {
        unsigned char sha1[20];
-       const char *git_HEAD = xstrdup(git_path("%s", HEAD));
-       const char *git_refs_heads_master = resolve_ref(git_HEAD, sha1, 0);
-       if (git_refs_heads_master) {
-               /* we want to strip the .git/ part */
-               int pfxlen = strlen(git_HEAD) - strlen(HEAD);
-               puts(git_refs_heads_master + pfxlen);
-       }
-       else
+       int flag;
+       const char *refs_heads_master = resolve_ref(HEAD, sha1, 0, &flag);
+
+       if (!refs_heads_master)
                die("No such ref: %s", HEAD);
+       else if (!(flag & REF_ISSYMREF)) {
+               if (!quiet)
+                       die("ref %s is not a symbolic ref", HEAD);
+               else
+                       exit(1);
+       }
+       puts(refs_heads_master);
 }
 
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 {
-       git_config(git_default_config);
+       int quiet = 0;
+       const char *msg = NULL;
+       struct option options[] = {
+               OPT__QUIET(&quiet),
+               OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
+               OPT_END(),
+       };
+
+       git_config(git_default_config, NULL);
+       argc = parse_options(argc, argv, options, git_symbolic_ref_usage, 0);
+       if (msg &&!*msg)
+               die("Refusing to perform update with empty message");
        switch (argc) {
-       case 2:
-               check_symref(argv[1]);
+       case 1:
+               check_symref(argv[0], quiet);
                break;
-       case 3:
-               create_symref(xstrdup(git_path("%s", argv[1])), argv[2]);
+       case 2:
+               create_symref(argv[0], argv[1], msg);
                break;
        default:
-               usage(git_symbolic_ref_usage);
+               usage_with_options(git_symbolic_ref_usage, options);
        }
        return 0;
 }