Skip to content

Commit

Permalink
refs.c: change update_ref to use a transaction
Browse files Browse the repository at this point in the history
Change the update_ref helper function to use a ref transaction internally.

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>
  • Loading branch information
Ronnie Sahlberg authored and Junio C Hamano committed Sep 3, 2014
1 parent d43f990 commit b4d75ac
Showing 1 changed file with 26 additions and 4 deletions.
30 changes: 26 additions & 4 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3519,11 +3519,33 @@ 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(&err);
if (!t ||
ref_transaction_update(t, refname, sha1, oldval, flags,
!!oldval, &err) ||
ref_transaction_commit(t, action, &err)) {
const char *str = "update_ref failed for ref '%s': %s";

ref_transaction_free(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);
}
strbuf_release(&err);
ref_transaction_free(t);
return 0;
}

static int ref_update_compare(const void *r1, const void *r2)
Expand Down

0 comments on commit b4d75ac

Please sign in to comment.