From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 03 Dec 2014 23:13:13 GMT
Subject: Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git
Message-ID: <xmqqvblsuy2e.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20141203051911.GP6527@google.com>

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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).  The fact that the helper
unable-to-lock-message() is now hidden inside lockfile.c does not
help, either.