Skip to content

Commit b4d75ac

Browse files
rsahlberggitster
authored andcommitted
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> 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>
1 parent d43f990 commit b4d75ac

1 file changed

Lines changed: 26 additions & 4 deletions

File tree

refs.c

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3519,11 +3519,33 @@ int update_ref(const char *action, const char *refname,
35193519
const unsigned char *sha1, const unsigned char *oldval,
35203520
int flags, enum action_on_err onerr)
35213521
{
3522-
struct ref_lock *lock;
3523-
lock = update_ref_lock(refname, oldval, flags, NULL, onerr);
3524-
if (!lock)
3522+
struct ref_transaction *t;
3523+
struct strbuf err = STRBUF_INIT;
3524+
3525+
t = ref_transaction_begin(&err);
3526+
if (!t ||
3527+
ref_transaction_update(t, refname, sha1, oldval, flags,
3528+
!!oldval, &err) ||
3529+
ref_transaction_commit(t, action, &err)) {
3530+
const char *str = "update_ref failed for ref '%s': %s";
3531+
3532+
ref_transaction_free(t);
3533+
switch (onerr) {
3534+
case UPDATE_REFS_MSG_ON_ERR:
3535+
error(str, refname, err.buf);
3536+
break;
3537+
case UPDATE_REFS_DIE_ON_ERR:
3538+
die(str, refname, err.buf);
3539+
break;
3540+
case UPDATE_REFS_QUIET_ON_ERR:
3541+
break;
3542+
}
3543+
strbuf_release(&err);
35253544
return 1;
3526-
return update_ref_write(action, refname, sha1, lock, NULL, onerr);
3545+
}
3546+
strbuf_release(&err);
3547+
ref_transaction_free(t);
3548+
return 0;
35273549
}
35283550

35293551
static int ref_update_compare(const void *r1, const void *r2)

0 commit comments

Comments
 (0)