From: Ronnie Sahlberg Date: Wed, 14 May 2014 21:16:51 GMT Subject: [PATCH v7 17/42] refs.c: change update_ref to use a transaction Message-ID: <1400102236-30082-18-git-send-email-sahlberg@google.com> In-Reply-To: <1400102236-30082-1-git-send-email-sahlberg@google.com> Change the update_ref helper function to use a ref transaction internally. Signed-off-by: Ronnie Sahlberg --- refs.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 64e3d53..55aa5a9 100644 --- a/refs.c +++ b/refs.c @@ -3405,11 +3405,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) -- 2.0.0.rc3.471.g2055d11.dirty