X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=refs.c;h=24438c652fe4e09aaa1ba6dab283b8e59c24c1a7;hb=95a877a34c3838a92a99794ebc3b082f6f525899;hp=bb4bdc9eac9a3cb5a122437f14a0f175511b1493;hpb=e05aae684d453695bc5bd1e66aa96bc7d42e186a;p=git.git diff --git a/refs.c b/refs.c index bb4bdc9ea..24438c652 100644 --- a/refs.c +++ b/refs.c @@ -751,9 +751,8 @@ int check_ref_format(const char *ref) } } -const char *prettify_ref(const struct ref *ref) +const char *prettify_refname(const char *name) { - const char *name = ref->name; return name + ( !prefixcmp(name, "refs/heads/") ? 11 : !prefixcmp(name, "refs/tags/") ? 10 : @@ -894,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));