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

refs.c: change update_ref to use a transaction

Browse Source 
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>
This commit is contained in:
Ronnie Sahlberg 2014-04-24 16:36:55 -07:00 committed by Junio C Hamano
parent d43f990fac
commit b4d75ac1d1
1 changed files with 26 additions and 4 deletions

30
refs.c
View File

@ -3519,11 +3519,33 @@ int update_ref(const char *action, const char *refname,
const unsigned char *sha1, const unsigned char *oldval, const unsigned char *sha1, const unsigned char *oldval,
int flags, enum action_on_err onerr) int flags, enum action_on_err onerr)
{ {
struct ref_lock *lock; struct ref_transaction *t;
lock = update_ref_lock(refname, oldval, flags, NULL, onerr); struct strbuf err = STRBUF_INIT;
if (!lock)
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 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) static int ref_update_compare(const void *r1, const void *r2)