From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v21 10/19] refs.c: verify_lock should set errno to something meaningful
Date: Mon, 14 Jul 2014 13:58:52 -0700 [thread overview]
Message-ID: <1405371541-32121-11-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405371541-32121-1-git-send-email-sahlberg@google.com>
Making errno when returning from verify_lock() meaningful, which
should almost but not completely fix
* a bug in "git fetch"'s s_update_ref, which trusts the result of an
errno == ENOTDIR check to detect D/F conflicts
ENOTDIR makes sense as a sign that a file was in the way of a
directory we wanted to create. Should "git fetch" also look for
ENOTEMPTY or EEXIST to catch cases where a directory was in the way
of a file to be created?
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 4 ++++
refs.h | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index 9ea519c..a48f805 100644
--- a/refs.c
+++ b/refs.c
@@ -1932,18 +1932,22 @@ int refname_match(const char *abbrev_name, const char *full_name)
return 0;
}
+/* This function should make sure errno is meaningful on error */
static struct ref_lock *verify_lock(struct ref_lock *lock,
const unsigned char *old_sha1, int mustexist)
{
if (read_ref_full(lock->ref_name, lock->old_sha1, mustexist, NULL)) {
+ int save_errno = errno;
error("Can't verify ref %s", lock->ref_name);
unlock_ref(lock);
+ errno = save_errno;
return NULL;
}
if (hashcmp(lock->old_sha1, old_sha1)) {
error("Ref %s is at %s but expected %s", lock->ref_name,
sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1));
unlock_ref(lock);
+ errno = EBUSY;
return NULL;
}
return lock;
diff --git a/refs.h b/refs.h
index 82cc5cb..8d6cac7 100644
--- a/refs.h
+++ b/refs.h
@@ -137,11 +137,15 @@ extern int ref_exists(const char *);
*/
extern int peel_ref(const char *refname, unsigned char *sha1);
-/** Locks a "refs/" ref returning the lock on success and NULL on failure. **/
+/*
+ * Locks a "refs/" ref returning the lock on success and NULL on failure.
+ * On failure errno is set to something meaningful.
+ */
extern struct ref_lock *lock_ref_sha1(const char *refname, const unsigned char *old_sha1);
/** Locks any ref (for 'HEAD' type refs). */
#define REF_NODEREF 0x01
+/* errno is set to something meaningful on failure */
extern struct ref_lock *lock_any_ref_for_update(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p);
--
2.0.1.546.gf603308
next prev parent reply other threads:[~2014-07-14 20:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 20:58 [PATCH v21 00/19] Use ref transactions Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 01/19] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 02/19] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 03/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 04/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 05/19] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 06/19] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 07/19] lockfile.c: make lock_file return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 08/19] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 09/19] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` Ronnie Sahlberg [this message]
2014-07-14 20:58 ` [PATCH v21 11/19] refs.c: make remove_empty_directories always set errno to something sane Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 12/19] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 13/19] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 14/19] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 15/19] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 16/19] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 17/19] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 18/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 19/19] refs.c: change ref_transaction_update() to do error checking and return status 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=1405371541-32121-11-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).