From: Ronnie Sahlberg Date: Thu, 05 Jun 2014 23:17:12 GMT Subject: [PATCH 2/4] refs.c: return error instead of dying when locking fails during transaction Message-ID: <1402010234-7628-3-git-send-email-sahlberg@google.com> In-Reply-To: <1402010234-7628-1-git-send-email-sahlberg@google.com> Change lock_ref_sha1_basic to return an error instead of dying when we fail to lock a file during a transaction. Signed-off-by: Ronnie Sahlberg --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs.c b/refs.c index e3a0383..ab0b629 100644 --- a/refs.c +++ b/refs.c @@ -2153,7 +2153,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, */ goto retry; else - unable_to_lock_index_die(ref_file, errno); + goto error_return; } return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock; -- 2.0.0.583.g402232d