[PATCH v3 2/5] refs.c: return error instead of dying when locking fails during transaction
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- Jun 18, 2014, 17:24 UTC
- Message-ID
- <1403112271-21331-3-git-send-email-sahlberg@google.com>
- In-Reply-To
- <1403112271-21331-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 11dcb07..a644e7c 100644 --- a/refs.c +++ b/refs.c @@ -2195,7 +2195,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.467.g08c0633