Merge git://git.kernel.org/pub/scm/gitk/gitk

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

diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index 5bd71825fdc48392952faf170efe98c072c7e482..fe1f74c9f3fa4a44cfd56508171e65a40e27342c 100644 (file)
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -3,16 +3,16 @@
 #include "builtin.h"
 
 static const char git_update_ref_usage[] =
-"git-update-ref <refname> <value> [<oldval>] [-m <reason>]";
+"git-update-ref [-m <reason>] (-d <refname> <value> | [--no-deref] <refname> <value> [<oldval>])";
 
 int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
        const char *refname=NULL, *value=NULL, *oldval=NULL, *msg=NULL;
-       struct ref_lock *lock;
        unsigned char sha1[20], oldsha1[20];
-       int i;
+       int i, delete, ref_flags;
 
-       setup_ident();
+       delete = 0;
+       ref_flags = 0;
        git_config(git_default_config);
 
        for (i = 1; i < argc; i++) {
@@ -22,8 +22,14 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                        msg = argv[++i];
                        if (!*msg)
                                die("Refusing to perform update with empty message.");
-                       if (strchr(msg, '\n'))
-                               die("Refusing to perform update with \\n in message.");
+                       continue;
+               }
+               if (!strcmp("-d", argv[i])) {
+                       delete = 1;
+                       continue;
+               }
+               if (!strcmp("--no-deref", argv[i])) {
+                       ref_flags |= REF_NODEREF;
                        continue;
                }
                if (!refname) {
@@ -44,16 +50,17 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 
        if (get_sha1(value, sha1))
                die("%s: not a valid SHA1", value);
-       memset(oldsha1, 0, 20);
-       if (oldval && get_sha1(oldval, oldsha1))
-               die("%s: not a valid old SHA1", oldval);
 
-       lock = lock_any_ref_for_update(refname, oldval ? oldsha1 : NULL, 0);
-       if (!lock)
-               return 1;
-       if (write_ref_sha1(lock, sha1, msg) < 0)
-               return 1;
+       if (delete) {
+               if (oldval)
+                       usage(git_update_ref_usage);
+               return delete_ref(refname, sha1);
+       }
+
+       hashclr(oldsha1);
+       if (oldval && *oldval && get_sha1(oldval, oldsha1))
+               die("%s: not a valid old SHA1", oldval);
 
-       /* write_ref_sha1 always unlocks the ref, no need to do it explicitly */
-       return 0;
+       return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
+                         ref_flags, DIE_ON_ERR);
 }