From: Junio C Hamano <gitster@pobox.com>
To: "Kyle Meyer" <kyle@kyleam.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: "Boettger\, Heiko" <Heiko.Boettger@karlstorz.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: specifying revision - how to enforce matching a tag/branch-name or revision only
Date: Fri, 21 Jun 2019 08:16:06 -0700 [thread overview]
Message-ID: <xmqq8stvklzd.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <87sgs3rhpo.fsf@kyleam.com> (Kyle Meyer's message of "Thu, 20 Jun 2019 18:54:11 -0400")
Kyle Meyer <kyle@kyleam.com> writes:
>> git rev-parse "${BRANCH_NAME}" || git rev-parse "refs/remotes/${UPSTREAM}/${BRANCH_NAME}"
>>
>> Unfortunately somebody used the branch name "add-gcc10" and `git rev-parse` which didn't exist on one repository. However `git rev-parse`
>> also supports to parse the `git-describe` format which resulted in checkout a commit starting with "cc10".
>
> Can't you prepend "refs/heads/" to BRANCH_NAME to disambiguate?
Yes, that is the kosher way for most commands.
It gets a bit tricky for "checkout <branch-or-committish>" that
changes its behaviour (a local branch is checked out and the next
commit extends it, other committishes like tags and remote-tracking
branch tips are checked out on a detached HEAD), and has special
rules for a "${BRANCH_NAME}" that is both the name of a local branch
and something else.
Hopefully (Duy Cc'ed) "git switch" would improve the situation.
next prev parent reply other threads:[~2019-06-21 15:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 14:32 specifying revision - how to enforce matching a tag/branch-name or revision only Boettger, Heiko
2019-06-20 22:54 ` Kyle Meyer
2019-06-21 15:16 ` Junio C Hamano [this message]
2019-06-25 11:43 ` Duy Nguyen
2019-06-25 14:35 ` AW: " Boettger, Heiko
2019-06-26 8:41 ` [PATCH/RFC] get_oid: new extended SHA-1 syntax to control resolution process Nguyễn Thái Ngọc Duy
2019-06-26 18:51 ` Junio C Hamano
2019-06-27 2:52 ` Duy Nguyen
2019-06-27 16:47 ` Junio C Hamano
2019-06-30 9:30 ` Jakub Narebski
2019-07-01 0:30 ` Duy Nguyen
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=xmqq8stvklzd.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Heiko.Boettger@karlstorz.com \
--cc=git@vger.kernel.org \
--cc=kyle@kyleam.com \
--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).