diff options
| author | Sven Verdoolaege <skimo@kotnet.org> | 2007-05-09 12:33:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 15:24:44 -0700 |
| commit | 68db31cc289c686c4b4454dfbb121aff59a6c602 (patch) | |
| tree | e2a02bc97e8afad4327f9ece6bc81ca497f26602 /builtin-update-ref.c | |
| parent | 843142ada000a992fa87bd2dc7796501332a52d9 (diff) | |
| download | git-68db31cc289c686c4b4454dfbb121aff59a6c602.tar.gz | |
git-update-ref: add --no-deref option for overwriting/detaching ref
git-checkout is also adapted to make use of this new option
instead of the handcrafted command sequence.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-update-ref.c')
| -rw-r--r-- | builtin-update-ref.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/builtin-update-ref.c b/builtin-update-ref.c index 5ee960bf41..feac2ed12d 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 <reason>] (-d <refname> <value> | <refname> <value> [<oldval>])"; +"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, 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) |