Fixed. Thanks.
On Wed, Apr 23, 2014 at 1:12 PM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote:
> On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg <sahlberg@xxxxxxxxxx> wrote:
>> Change s_update_ref to use a ref transaction for the ref update.
>> Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
>>
>> Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
>
> Doubled sign-off.
>
>> ---
>> builtin/fetch.c | 15 +++++++--------
>> 1 file changed, 7 insertions(+), 8 deletions(-)
>>
>> diff --git a/builtin/fetch.c b/builtin/fetch.c
>> index a93c893..5c15584 100644
>> --- a/builtin/fetch.c
>> +++ b/builtin/fetch.c
>> @@ -375,7 +375,7 @@ static int s_update_ref(const char *action,
>> {
>> char msg[1024];
>> char *rla = getenv("GIT_REFLOG_ACTION");
>> - static struct ref_lock *lock;
>> + struct ref_transaction *transaction;
>>
>> if (dry_run)
>> return 0;
>> @@ -384,15 +384,14 @@ static int s_update_ref(const char *action,
>> snprintf(msg, sizeof(msg), "%s: %s", rla, action);
>>
>> errno = 0;
>> - lock = lock_any_ref_for_update(ref->name,
>> - check_old ? ref->old_sha1 : NULL,
>> - 0, NULL);
>> - if (!lock)
>> - return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
>> - STORE_REF_ERROR_OTHER;
>> - if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
>> + transaction = ref_transaction_begin();
>> + if (!transaction ||
>> + ref_transaction_update(transaction, ref->name, ref->new_sha1,
>> + ref->old_sha1, 0, check_old) ||
>> + ref_transaction_commit(transaction, msg, UPDATE_REFS_QUIET_ON_ERR))
>> return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
>> STORE_REF_ERROR_OTHER;
>> +
>> return 0;
>> }
>>
>> --
>> 1.9.1.518.g16976cb.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html