From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Tue, 08 Jul 2014 15:07:43 GMT
Subject: Re: [PATCH v20 44/48] refs.c: call lock_ref_sha1_basic directly from commit
Message-ID: <53BC093F.6010604@alum.mit.edu>
In-Reply-To: <1403275409-28173-45-git-send-email-sahlberg@google.com>

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
> Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic
> directly from the commit function.

This commit is obviously hostage to whether commit 43/48 is kept.

> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> ---
>  refs.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/refs.c b/refs.c
> index bccf8c3..f3fab37 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3598,12 +3598,12 @@ int ref_transaction_commit(struct ref_transaction *transaction,
>  	for (i = 0; i < n; i++) {
>  		struct ref_update *update = updates[i];
>  
> -		update->lock = lock_any_ref_for_update(update->refname,
> -						       (update->have_old ?
> -							update->old_sha1 :
> -							NULL),
> -						       update->flags,
> -						       &update->type);
> +		update->lock = lock_ref_sha1_basic(update->refname,
> +						   (update->have_old ?
> +						    update->old_sha1 :
> +						    NULL),
> +						   update->flags,
> +						   &update->type);
>  		if (!update->lock) {
>  			if (err)
>  				strbuf_addf(err, "Cannot lock the ref '%s'.",
> 

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu