[PATCH 2/5] refs.c: return error instead of dying when locking fails during transaction

From: Ronnie Sahlberg <sahlberg@google.com>
Date: Jul 25, 2014, 16:58 UTC
Message-ID: <1406307521-10339-3-git-send-email-sahlberg@google.com>
In-Reply-To: <1406307521-10339-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 <sahlberg@google.com>
---
 refs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/refs.c b/refs.c
index 6c55032..2ea85a8 100644
--- a/refs.c
+++ b/refs.c
@@ -2214,7 +2214,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;
 	}
 	if (bad_ref)
 		return lock;

-- 
2.0.1.508.g763ab16