X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=builtin-update-ref.c;h=feac2ed12d22dcd23db5823cd32a0f9f1c1c974a;hb=27c96c4fd38ffbde98df22699c755a043bb383d1;hp=5ee960bf41c4518b6c5530acb123a7ed668538fc;hpb=e986e26a86616054f96373280e8f9cc89d7ea8ca;p=git.git diff --git a/builtin-update-ref.c b/builtin-update-ref.c index 5ee960bf4..feac2ed12 100644 --- a/builtin-update-ref.c +++ b/builtin-update-ref.c @@ -3,16 +3,17 @@ #include "builtin.h" static const char git_update_ref_usage[] = -"git-update-ref [-m ] (-d | [])"; +"git-update-ref [-m ] (-d | [--no-deref] [])"; 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, delete; + int i, delete, ref_flags; delete = 0; + ref_flags = 0; git_config(git_default_config); for (i = 1; i < argc; i++) { @@ -30,6 +31,10 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) delete = 1; continue; } + if (!strcmp("--no-deref", argv[i])) { + ref_flags |= REF_NODEREF; + continue; + } if (!refname) { refname = argv[i]; continue; @@ -59,7 +64,7 @@ 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); - lock = lock_any_ref_for_update(refname, oldval ? oldsha1 : NULL); + lock = lock_any_ref_for_update(refname, oldval ? oldsha1 : NULL, ref_flags); if (!lock) die("%s: cannot lock the ref", refname); if (write_ref_sha1(lock, sha1, msg) < 0)