diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-05-15 10:29:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-15 14:11:34 -0700 |
commit | 1530c4a53e9b8c30b033bcbb9244e68d372b4fce (patch) | |
tree | 2727d93b41504e9930cf098d684fc0481a7be4d3 | |
parent | 99edbbe41193a1c23ac3cc8b92e383dd59ebec56 (diff) | |
download | git-1530c4a53e9b8c30b033bcbb9244e68d372b4fce.tar.gz |
refs.c: change update_ref to use a transaction
Change the update_ref helper function to use a ref transaction internally.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | refs.c | 25 |
1 files changed, 21 insertions, 4 deletions
@@ -3416,11 +3416,28 @@ int update_ref(const char *action, const char *refname, const unsigned char *sha1, const unsigned char *oldval, int flags, enum action_on_err onerr) { - struct ref_lock *lock; - lock = update_ref_lock(refname, oldval, flags, NULL, onerr); - if (!lock) + struct ref_transaction *t; + struct strbuf err = STRBUF_INIT; + + t = ref_transaction_begin(); + if ((!t || + ref_transaction_update(t, refname, sha1, oldval, flags, + !!oldval)) || + (ref_transaction_commit(t, action, &err) && !(t = NULL))) { + const char *str = "update_ref failed for ref '%s': %s"; + + ref_transaction_rollback(t); + switch (onerr) { + case UPDATE_REFS_MSG_ON_ERR: + error(str, refname, err.buf); break; + case UPDATE_REFS_DIE_ON_ERR: + die(str, refname, err.buf); break; + case UPDATE_REFS_QUIET_ON_ERR: break; + } + strbuf_release(&err); return 1; - return update_ref_write(action, refname, sha1, lock, NULL, onerr); + } + return 0; } static int ref_update_compare(const void *r1, const void *r2) |