From: Jeff King <peff@peff.net>
To: Andreas Krey <a.krey@gmx.de>
Cc: "Git Users" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: Regression in 'git branch -m'?
Date: Thu, 5 Oct 2017 14:33:03 -0400 [thread overview]
Message-ID: <20171005183303.f77dpkhs5ztxlmyv@sigill.intra.peff.net> (raw)
In-Reply-To: <20171005172552.GA11497@inner.h.apk.li>
On Thu, Oct 05, 2017 at 07:25:52PM +0200, Andreas Krey wrote:
> I got something that looks like a regression somewhere since 2.11.
> This script
>
> set -xe
> rm -rf repo
> git init repo
> cd repo
> git commit -m nix --allow-empty
> git branch -m master/master
> git rev-parse HEAD
> git branch
> git status
>
> causes .git/HEAD to still contain 'ref: refs/heads/master' and to fail
> in the rev-parse step with
>
> + git rev-parse HEAD
> HEAD
> fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
>
> This is with 2.15.0.rc0; with 2.11.0 (and 2.11.0.356.gffac48d09) it still works.
>
> I'm going to do a bisect on this as battery permits.
Looks like 31824d180d (branch: fix branch renaming not updating HEADs
correctly, 2017-08-24). This is in v2.15.0-rc0, so we should figure it
out before the upcoming release.
I didn't dig very far, but it looks like the branch name is important
"foo" doesn't trigger the problem but "master/master" does. "master/foo"
also does, but "foo/master" does not. So I suspect it's something about
how resolve_ref handles the failure when it would not be able to create
the ref because of the d/f conflict. So it's probably related to losing
the RESOLVE_REF_READING in the final hunk of that patch. That's just a
guess for now, though.
-Peff
next prev parent reply other threads:[~2017-10-05 18:33 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 [this message]
2017-10-06 7:39 ` Jeff King
2017-10-06 8:37 ` Jeff King
2017-10-06 9:45 ` Junio C Hamano
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=20171005183303.f77dpkhs5ztxlmyv@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/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).