From: Ronnie Sahlberg Date: Wed, 14 May 2014 22:13:13 GMT Subject: [PATCH 14/31] refs.c: return error instead of dying when locking fails during transaction Message-ID: <1400105610-21194-15-git-send-email-sahlberg@google.com> In-Reply-To: <1400105610-21194-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 3249576..8212d77 100644 --- a/refs.c +++ b/refs.c @@ -2147,7 +2147,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.rc3.506.g3739a35