Re: [PATCH v10 14/44] replace.c: use the ref transaction functions for updates
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:01:13
On 05/16/2014 07:37 PM, Ronnie Sahlberg wrote:
quoted hunk ↗ jump to hunk
Update replace.c to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg <redacted> --- builtin/replace.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)diff --git a/builtin/replace.c b/builtin/replace.c index 3da1bae..e8932cd 100644 --- a/builtin/replace.c +++ b/builtin/replace.c@@ -133,7 +133,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; if (snprintf(ref, sizeof(ref), "refs/replace/%s",@@ -156,11 +157,12 @@ static int replace_object_sha1(const char *object_ref, else if (!force) die("replace ref '%s' already exists", ref); - 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(); + if (!transaction || + ref_transaction_update(transaction, ref, repl, prev, + 0, !is_null_sha1(prev), &err) || + ref_transaction_commit(transaction, NULL, &err)) + die("%s", err.buf);
Same here: err can be empty if ref_transaction_begin() fails. Please check later patches for the same error.
return 0; }
-- Michael Haggerty mhagger@alum.mit.edu http://softwareswirl.blogspot.com/