git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: Dana Dahlstrom <dahlstrom@google.com>, git@vger.kernel.org
Subject: Re: 'HEAD' is not a commit (according to git-checkout)
Date: Sun, 24 May 2020 09:23:32 +0200	[thread overview]
Message-ID: <ad267e83-eea0-bb78-d88c-a37a28d04dbe@web.de> (raw)
In-Reply-To: <20200523162914.GA2178752@coredump.intra.peff.net>

Am 23.05.20 um 18:29 schrieb Jeff King:
> On Sat, May 23, 2020 at 09:07:50AM +0200, René Scharfe wrote:
>
>>> which are both correct. I wonder if there's a more elegant way to do it,
>>> though (probably not, as there's definitely some heuristic parsing going
>>> on to determine which checkout mode we're in; the new switch/restore
>>> alternatives don't suffer as much from this).
>>
>> Perhaps:
>>
>> diff --git a/builtin/checkout.c b/builtin/checkout.c
>> index e9d111bb83..24336e1017 100644
>> --- a/builtin/checkout.c
>> +++ b/builtin/checkout.c
>> @@ -1689,7 +1689,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
>>  		 * Try to give more helpful suggestion.
>>  		 * new_branch && argc > 1 will be caught later.
>>  		 */
>> -		if (opts->new_branch && argc == 1)
>> +		if (opts->new_branch && argc == 1 && !new_branch_info.commit)
>>  			die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
>>  				argv[0], opts->new_branch);
>>
>
> Oh, indeed, that's way better. Want to wrap it up as a patch?

OK, but stepping back a bit and trying to forget what I know about the
option --track and pretending to see it for the first time, I have to
ask: Why doesn't it take an argument?  If I check out a raw commit, it
cannot guess the upstream branch anyway.  So I'd assume this to work:

   git checkout -b new-branch --track=upstream start-point

René

  parent reply	other threads:[~2020-05-24  7:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-21 19:00 'HEAD' is not a commit (according to git-checkout) Dana Dahlstrom
2020-05-21 19:16 ` Jeff King
2020-05-23  7:07   ` René Scharfe
2020-05-23 16:29     ` Jeff King
2020-05-24  7:22       ` [PATCH 1/2] checkout: add tests for -b and --track René Scharfe
2020-05-27  6:40         ` Jeff King
2020-05-28 13:53           ` René Scharfe
2020-05-24  7:23       ` [PATCH 2/2] checkout: improve error messages for -b with extra argument René Scharfe
2020-05-27  6:42         ` Jeff King
2020-05-24  7:23       ` René Scharfe [this message]
2020-05-24 16:15         ` 'HEAD' is not a commit (according to git-checkout) Junio C Hamano
2020-05-27  6:52           ` Jeff King
2020-05-27 15:44             ` Junio C Hamano
2020-05-27 15:52               ` Randall S. Becker
2020-05-27 17:31                 ` Jeff King
2020-05-21 19:49 ` René Scharfe

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=ad267e83-eea0-bb78-d88c-a37a28d04dbe@web.de \
    --to=l.s.r@web.de \
    --cc=dahlstrom@google.com \
    --cc=git@vger.kernel.org \
    --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).