push: support pushing HEAD to real branch name

diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c
index d8be0527f4752131b0a1276ecedcc82714636c28..d33982b967e7665ae79fb186435d9ed9aabb907b 100644 (file)
--- a/builtin-symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -1,11 +1,14 @@
 #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];
        int flag;
@@ -13,23 +16,38 @@ static void check_symref(const char *HEAD)
 
        if (!refs_heads_master)
                die("No such ref: %s", HEAD);
-       else if (!(flag & REF_ISSYMREF))
-               die("ref %s is not a symbolic ref", 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)
 {
+       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);
+       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(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;
 }