diff options
| author | Carlos Rica <jasampler@gmail.com> | 2007-09-05 03:38:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-05 11:29:33 -0700 |
| commit | 3d9f037c60ceae1bd60ee3c861564812a89b05b1 (patch) | |
| tree | 6bf932b630728e2313ffacd8ef573eb63fdc383e /builtin-update-ref.c | |
| parent | 1e61b7640d09015213dbcae3564fa27ac6a8c151 (diff) | |
| download | git-3d9f037c60ceae1bd60ee3c861564812a89b05b1.tar.gz | |
Function for updating refs.
A function intended to be called from builtins updating refs
by locking them before write, specially those that came from
scripts using "git update-ref".
[jc: with minor fixups]
Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-update-ref.c')
| -rw-r--r-- | builtin-update-ref.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/builtin-update-ref.c b/builtin-update-ref.c index 8339cf19e2..fe1f74c9f3 100644 --- a/builtin-update-ref.c +++ b/builtin-update-ref.c @@ -8,7 +8,6 @@ static const char git_update_ref_usage[] = 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, ref_flags; @@ -62,10 +61,6 @@ 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, ref_flags); - if (!lock) - die("%s: cannot lock the ref", refname); - if (write_ref_sha1(lock, sha1, msg) < 0) - die("%s: cannot update the ref", refname); - return 0; + return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL, + ref_flags, DIE_ON_ERR); } |