undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tag.c: use ref transactions when doing updates

Browse Source 
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>
This commit is contained in:
Ronnie Sahlberg 2014-04-16 15:30:41 -07:00 committed by Junio C Hamano
parent 2bdc785fd7
commit e5074bfe8c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/tag.c
View File

@ -548,7 +548,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
struct strbuf ref = STRBUF_INIT; struct strbuf ref = STRBUF_INIT;
unsigned char object[20], prev[20]; unsigned char object[20], prev[20];
const char *object_ref, *tag; const char *object_ref, *tag;
struct ref_lock *lock;
struct create_tag_options opt; struct create_tag_options opt;
char *cleanup_arg = NULL; char *cleanup_arg = NULL;
int annotate = 0, force = 0, lines = -1; int annotate = 0, force = 0, lines = -1;
@ -556,6 +555,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
const char *msgfile = NULL, *keyid = NULL; const char *msgfile = NULL, *keyid = NULL;
struct msg_arg msg = { 0, STRBUF_INIT }; struct msg_arg msg = { 0, STRBUF_INIT };
struct commit_list *with_commit = NULL; struct commit_list *with_commit = NULL;
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
struct option options[] = { struct option options[] = {
OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'), OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
{ OPTION_INTEGER, 'n', NULL, &lines, N_("n"), { OPTION_INTEGER, 'n', NULL, &lines, N_("n"),
@ -701,14 +702,17 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
if (annotate) if (annotate)
create_tag(object, tag, &buf, &opt, prev, object); create_tag(object, tag, &buf, &opt, prev, object);
lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL); transaction = ref_transaction_begin(&err);
if (!lock) if (!transaction ||
die(_("%s: cannot lock the ref"), ref.buf); ref_transaction_update(transaction, ref.buf, object, prev,
if (write_ref_sha1(lock, object, NULL) < 0) 0, 1, &err) ||
die(_("%s: cannot update the ref"), ref.buf); ref_transaction_commit(transaction, NULL, &err))
die("%s", err.buf);
ref_transaction_free(transaction);
if (force && !is_null_sha1(prev) && hashcmp(prev, object)) if (force && !is_null_sha1(prev) && hashcmp(prev, object))
printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV)); printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));
strbuf_release(&err);
strbuf_release(&buf); strbuf_release(&buf);
strbuf_release(&ref); strbuf_release(&ref);
return 0; return 0;