Re: [PATCH 06/11] replace.c: use the ref transaction functions for updates
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Apr 19, 2014, 19:14 UTC
- Message-ID
- <5352CB18.5000007@alum.mit.edu>
- In-Reply-To
- <1397763987-4453-7-git-send-email-sahlberg@google.com>
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote:
Show 37 quoted lines
> Update replace.c to use ref transactions for updates.
>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> ---
> builtin/replace.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/replace.c b/builtin/replace.c
> index b62420a..d8bd6ee 100644
> --- a/builtin/replace.c
> +++ b/builtin/replace.c
> @@ -129,7 +129,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
> unsigned char object[20], prev[20], repl[20];
> enum object_type obj_type, repl_type;
> char ref[PATH_MAX];
> - struct ref_lock *lock;
> + struct ref_transaction *transaction;
>
> if (get_sha1(object_ref, object))
> die("Failed to resolve '%s' as a valid ref.", object_ref);
> @@ -157,11 +157,14 @@ static int replace_object(const char *object_ref, const char *replace_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)
> + die(_("%s: cannot start transaction"), ref);
> + if (ref_transaction_update(transaction, ref, repl, prev,
> + 0, !is_null_sha1(prev)))
> + die(_("%s: cannot update transaction"), ref);
> + if (ref_transaction_commit(transaction, NULL, UPDATE_REFS_DIE_ON_ERR))
> + die(_("%s: cannot commit transaction"), ref);The same comment that I made to 05/11 applies here too (and, I predict, to other patches yet to come).
> > return 0; > } >
Michael
-- Michael Haggerty mhagger@alum.mit.edu http://softwareswirl.blogspot.com/