From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Karthik Nayak <karthik.188@gmail.com>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: [BUG] branch renamed to 'HEAD'
Date: Mon, 27 Feb 2017 14:28:09 -0800 [thread overview]
Message-ID: <xmqq60jvnu9y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170227090233.uk7dfruggytgmuw2@sigill.intra.peff.net> (Jeff King's message of "Mon, 27 Feb 2017 04:02:33 -0500")
Jeff King <peff@peff.net> writes:
> I guess something like the patch below works, but I wonder if there is a
> less-horrible way to accomplish the same thing.
I suspect that a less-horrible would be a lot more intrusive. It
would go like "interpret-branch-name only gives local branch name,
and when it does not show it, the callers that know they do not
necessarily need local branch name would call other at-mark things".
As you pointed out with the @{upstream} that potentially point at a
local branch, it will quickly get more involved, I would think, and
I tend to think that this patch of yours is probably the least evil
one among possible solutions.
Perhaps with s/not_in_refs_heads/not_a_branch_name/ (or swapping
polarity, "is_a_branch_name"), the resulting code may not be too
hard to read?
Thanks.
next prev parent reply other threads:[~2017-02-27 22:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 4:52 [BUG] branch renamed to 'HEAD' Luc Van Oostenryck
2017-02-27 6:13 ` Karthik Nayak
2017-02-27 6:47 ` Luc Van Oostenryck
2017-02-27 7:49 ` Jeff King
2017-02-27 8:01 ` Jeff King
2017-02-27 9:02 ` Jeff King
2017-02-27 9:47 ` Luc Van Oostenryck
2017-02-27 22:28 ` Junio C Hamano [this message]
2017-02-27 23:05 ` Jacob Keller
2017-02-28 0:33 ` Junio C Hamano
2017-02-28 0:53 ` Jeff King
2017-02-28 7:58 ` Jacob Keller
2017-02-28 12:06 ` Jeff King
2017-02-28 12:07 ` [PATCH 1/8] interpret_branch_name: move docstring to header file Jeff King
2017-02-28 12:07 ` [PATCH 2/8] strbuf_branchname: drop return value Jeff King
2017-02-28 12:07 ` [PATCH 3/8] strbuf_branchname: add docstring Jeff King
2017-02-28 12:14 ` [PATCH 4/8] interpret_branch_name: allow callers to restrict expansions Jeff King
2017-02-28 12:23 ` Jeff King
2017-02-28 12:33 ` Jeff King
2017-02-28 20:27 ` Junio C Hamano
2017-02-28 21:37 ` Jeff King
2017-02-28 12:15 ` [PATCH 5/8] t3204: test git-branch @-expansion corner cases Jeff King
2017-02-28 12:15 ` [PATCH 6/8] branch: restrict @-expansions when deleting Jeff King
2017-02-28 12:16 ` [PATCH 7/8] strbuf_check_ref_format(): expand only local branches Jeff King
2017-02-28 12:17 ` [PATCH 8/8] checkout: restrict @-expansions when finding branch Jeff King
2017-02-28 22:48 ` [BUG] branch renamed to 'HEAD' Jacob Keller
2017-03-01 17:35 ` Junio C Hamano
2017-02-28 0:49 ` Jeff King
2017-02-28 0:42 ` Jeff King
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=xmqq60jvnu9y.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.com \
--cc=luc.vanoostenryck@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).