tag.c: use ref transactions when doing updates
Change tag.c to use ref transactions for all ref updates. Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg committed
Apr 16, 2014 at 15:30 UTC
e5074bfe8cb895a060720a7cbb3f2ed4fd8cf710
1 file changed
+10
-6
builtin/tag.c
+10
-6
@@ -548,7 +548,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
548
struct strbuf ref = STRBUF_INIT;
549
unsigned char object[20], prev[20];
550
const char *object_ref, *tag;
551
- struct ref_lock *lock;
551
struct create_tag_options opt;
552
char *cleanup_arg = NULL;
553
int annotate = 0, force = 0, lines = -1;
@@ -556,6 +555,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
555
const char *msgfile = NULL, *keyid = NULL;
556
struct msg_arg msg = { 0, STRBUF_INIT };
557
struct commit_list *with_commit = NULL;
558
+ struct ref_transaction *transaction;
559
+ struct strbuf err = STRBUF_INIT;
560
struct option options[] = {
561
OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
562
{ OPTION_INTEGER, 'n', NULL, &lines, N_("n"),
@@ -701,14 +702,17 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
702
if (annotate)
703
create_tag(object, tag, &buf, &opt, prev, object);
704
704
- lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL);
705
- if (!lock)
706
- die(_("%s: cannot lock the ref"), ref.buf);
707
- if (write_ref_sha1(lock, object, NULL) < 0)
708
- die(_("%s: cannot update the ref"), ref.buf);
705
+ transaction = ref_transaction_begin(&err);
706
+ if (!transaction ||
707
+ ref_transaction_update(transaction, ref.buf, object, prev,
708
+ 0, 1, &err) ||
709
+ ref_transaction_commit(transaction, NULL, &err))
710
+ die("%s", err.buf);
711
+ ref_transaction_free(transaction);
712
if (force && !is_null_sha1(prev) && hashcmp(prev, object))
713
printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));
714
715
+ strbuf_release(&err);
716
strbuf_release(&buf);
717
strbuf_release(&ref);
718
return 0;