From: Jeff King <peff@peff.net>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: "Andreas Krey" <a.krey@gmx.de>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Git Users" <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] refs_resolve_ref_unsafe: handle d/f conflicts for writes
Date: Fri, 6 Oct 2017 13:16:23 -0400 [thread overview]
Message-ID: <20171006171623.kjzeavnzopowvqzv@sigill.intra.peff.net> (raw)
In-Reply-To: <38c17fdc-7a3b-d166-1abe-afe64fc823c5@alum.mit.edu>
On Fri, Oct 06, 2017 at 07:09:10PM +0200, Michael Haggerty wrote:
> I do have one twinge of uneasiness at a deeper level, that I haven't had
> time to check...
>
> Does this patch make it easier to *set* HEAD to an unborn branch that
> d/f conflicts with an existing reference? If so, that might be a
> slightly worse UI for users. I'd rather learn about such a problem when
> setting HEAD (when I am thinking about the new branch name and am in the
> frame of mind to solve the problem) rather than later, when I try to
> commit to the new branch.
Good question. The answer is no, it's allowed both before and after my
patch. At least via git-symbolic-ref.
I agree it would be nice to know earlier for such a case. For
symbolic-ref, we probably should allow it, because it's plumbing that
may be used for tricky things. For things like "checkout -b", you'd
generally get a timely warning as we try to create the ref.
The odd man out is "checkout --orphan", which leaves the branch unborn.
It might be nice if it did a manual check that the ref is available (and
also that it's syntactically acceptable, though I think we may do that
already).
But all of that is orthogonal to this fix, I think.
-Peff
next prev parent reply other threads:[~2017-10-06 17:16 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171006171623.kjzeavnzopowvqzv@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.