From: Jeff King Date: Mon, 25 May 2009 10:37:15 +0000 (-0400) Subject: lock_ref: inform callers of unavailable ref X-Git-Tag: v1.6.3.2~23 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f475e08edbbabe38bd758fd42f08f646551468d9;p=git.git lock_ref: inform callers of unavailable ref One of the ways that locking might fail is that there is a DF conflict between two refs (e.g., you want to lock "foo/bar" but "foo" already exists). In this case, we return an error, but there is no way for the caller to know the specific problem. This patch sets errno to ENOTDIR, which is the most sensible code. It's what we would see if the refs were stored purely in the filesystem (but these days we must check the namespace manually due to packed refs). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/refs.c b/refs.c index e65a3b4c4..8679c17e0 100644 --- a/refs.c +++ b/refs.c @@ -893,8 +893,10 @@ static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char * name is a proper prefix of our refname. */ if (missing && - !is_refname_available(ref, NULL, get_packed_refs(), 0)) + !is_refname_available(ref, NULL, get_packed_refs(), 0)) { + last_errno = ENOTDIR; goto error_return; + } lock->lk = xcalloc(1, sizeof(struct lock_file));