Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Dec 3, 2014, 23:24 UTC
- Message-ID
- <20141203232424.GI6527@google.com>
- In-Reply-To
- <xmqqvblsuy2e.fsf@gitster.dls.corp.google.com>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
Show 14 quoted lines
>> diff --git a/refs.c b/refs.c >> index 917f8fc..39e43cf 100644 >> --- a/refs.c >> +++ b/refs.c >> @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, >> */ >> goto retry; >> else >> - unable_to_lock_die(ref_file, errno); >> + unable_to_lock_die(ref_file, lflags, errno); >> } > > This has unfortunate interaction with 06839515 (lock_ref_sha1_basic: > do not die on locking errors, 2014-11-19).
I'll add that patch to the series. 06839515 becomes a little simpler with the updated API.
Thanks, Jonathan