From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Andreas Krey" <a.krey@gmx.de>, "Git Users" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: Regression in 'git branch -m'?
Date: Fri, 06 Oct 2017 18:45:08 +0900 [thread overview]
Message-ID: <xmqqzi94vcd7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171006083719.jap56jucgmlsuvuo@sigill.intra.peff.net> (Jeff King's message of "Fri, 6 Oct 2017 04:37:19 -0400")
Jeff King <peff@peff.net> writes:
> So this patch fixes the problem:
>
> diff --git a/refs.c b/refs.c
> index df075fcd06..2ba74720c8 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1435,7 +1435,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
> if (refs_read_raw_ref(refs, refname,
> sha1, &sb_refname, &read_flags)) {
> *flags |= read_flags;
> - if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
> + if ((errno != ENOENT && errno != EISDIR) ||
> + (resolve_flags & RESOLVE_REF_READING))
Ooo, good find--is_missing_file_error() strikes back...
> return NULL;
> hashclr(sha1);
> if (*flags & REF_BAD_NAME)
>
> but seems to stimulate a test failure in t3308. I have a suspicion that
> I've just uncovered another bug, but I'll dig in that. In the meantime I
> wanted to post this update in case anybody else was looking into it.
>
> -Peff
next prev parent reply other threads:[~2017-10-06 9:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 17:25 Regression in 'git branch -m'? Andreas Krey
2017-10-05 18:33 ` Jeff King
2017-10-06 7:39 ` Jeff King
2017-10-06 8:37 ` Jeff King
2017-10-06 9:45 ` Junio C Hamano [this message]
2017-10-06 10:06 ` Jeff King
2017-10-06 14:37 ` Jeff King
2017-10-06 14:38 ` [PATCH 1/2] t3308: create a real ref directory/file conflict Jeff King
2017-10-06 14:42 ` [PATCH 2/2] refs_resolve_ref_unsafe: handle d/f conflicts for writes Jeff King
2017-10-06 17:09 ` Michael Haggerty
2017-10-06 17:16 ` Jeff King
2017-10-07 4:36 ` Michael Haggerty
2017-11-05 5:36 ` Michael Haggerty
2017-10-07 1:31 ` Regression in 'git branch -m'? Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzi94vcd7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).