Merge branch 'maint-1.6.0' into maint

diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index d90d11d2e35c38baab32f05f58125aaf1baee6cc..378dc1b7a6bb4d56d301a34a4d44dae2f9a37e44 100644 (file)
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -4,8 +4,8 @@
 #include "parse-options.h"
 
 static const char * const git_update_ref_usage[] = {
-       "git-update-ref [options] -d <refname> [<oldval>]",
-       "git-update-ref [options]    <refname> <newval> [<oldval>]",
+       "git update-ref [options] -d <refname> [<oldval>]",
+       "git update-ref [options]    <refname> <newval> [<oldval>]",
        NULL
 };
 
@@ -13,7 +13,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
        const char *refname, *oldval, *msg=NULL;
        unsigned char sha1[20], oldsha1[20];
-       int delete = 0, no_deref = 0;
+       int delete = 0, no_deref = 0, flags = 0;
        struct option options[] = {
                OPT_STRING( 'm', NULL, &msg, "reason", "reason of the update"),
                OPT_BOOLEAN('d', NULL, &delete, "deletes the reference"),
@@ -47,9 +47,11 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
        if (oldval && *oldval && get_sha1(oldval, oldsha1))
                die("%s: not a valid old SHA1", oldval);
 
+       if (no_deref)
+               flags = REF_NODEREF;
        if (delete)
-               return delete_ref(refname, oldval ? oldsha1 : NULL);
+               return delete_ref(refname, oldval ? oldsha1 : NULL, flags);
        else
                return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
-                                 no_deref ? REF_NODEREF : 0, DIE_ON_ERR);
+                                 flags, DIE_ON_ERR);
 }