summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-26 02:44:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-26 02:44:52 (GMT)
commit23807fa0086ae6ad6980a2a1071f23ed1a6dde93 (patch)
tree7e73547d4f5187bfb985282d94d358ed7b0ca255 /refs.c
parent3cd7388d57db4f4a29949e8de96493fb77059484 (diff)
parente57cb0158209ece040a4b873064504efd7d2ec0e (diff)
downloadgit-23807fa0086ae6ad6980a2a1071f23ed1a6dde93.zip
git-23807fa0086ae6ad6980a2a1071f23ed1a6dde93.tar.gz
git-23807fa0086ae6ad6980a2a1071f23ed1a6dde93.tar.bz2
Merge branch 'maint'
* maint: Prepare for 1.6.3.2 fix cat-file usage message and documentation fetch: report ref storage DF errors more accurately lock_ref: inform callers of unavailable ref merge-options.txt: Clarify merge --squash Conflicts: RelNotes
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 45ad556..24438c6 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));