From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH 2/4] refs.c: return error instead of dying when locking fails during transaction
Date: Thu, 5 Jun 2014 16:17:12 -0700 [thread overview]
Message-ID: <1402010234-7628-3-git-send-email-sahlberg@google.com> (raw)
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 <sahlberg@google.com>
---
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
next prev parent reply other threads:[~2014-06-06 5:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-05 23:17 [PATCH 0/4] Use transactions for renames Ronnie Sahlberg
2014-06-05 23:17 ` [PATCH 1/4] refs.c: allow passing raw git_committer_info as email to _update_reflog Ronnie Sahlberg
2014-06-05 23:17 ` Ronnie Sahlberg [this message]
2014-06-05 23:17 ` [PATCH 3/4] refs.c: use packed refs when deleting refs during a transaction Ronnie Sahlberg
2014-06-05 23:17 ` [PATCH 4/4] refs.c: update rename_ref to use " Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402010234-7628-3-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).