diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:44:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:44:52 -0700 |
commit | 23807fa0086ae6ad6980a2a1071f23ed1a6dde93 (patch) | |
tree | 7e73547d4f5187bfb985282d94d358ed7b0ca255 /refs.c | |
parent | 3cd7388d57db4f4a29949e8de96493fb77059484 (diff) | |
parent | e57cb0158209ece040a4b873064504efd7d2ec0e (diff) | |
download | git-23807fa0086ae6ad6980a2a1071f23ed1a6dde93.tar.gz |
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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)); |