Skip to content

Commit

Permalink
replace.c: use the ref transaction functions for updates
Browse files Browse the repository at this point in the history
Update replace.c to use ref transactions for updates.

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 e5074bf commit 867c2fa
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions builtin/replace.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ static int replace_object_sha1(const char *object_ref,
unsigned char prev[20];
enum object_type obj_type, repl_type;
char ref[PATH_MAX];
struct ref_lock *lock;
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;

obj_type = sha1_object_info(object, NULL);
repl_type = sha1_object_info(repl, NULL);
Expand All @@ -166,12 +167,13 @@ static int replace_object_sha1(const char *object_ref,

check_ref_valid(object, prev, ref, sizeof(ref), force);

lock = lock_any_ref_for_update(ref, prev, 0, NULL);
if (!lock)
die("%s: cannot lock the ref", ref);
if (write_ref_sha1(lock, repl, NULL) < 0)
die("%s: cannot update the ref", ref);
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_update(transaction, ref, repl, prev, 0, 1, &err) ||
ref_transaction_commit(transaction, NULL, &err))
die("%s", err.buf);

ref_transaction_free(transaction);
return 0;
}

Expand Down

0 comments on commit 867c2fa

Please sign in to comment.