From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Jeff King <peff@peff.net>, 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:15:33 -0700 [thread overview]
Message-ID: <xmqqimglqpga.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <ad267e83-eea0-bb78-d88c-a37a28d04dbe@web.de> ("René Scharfe"'s message of "Sun, 24 May 2020 09:23:32 +0200")
René Scharfe <l.s.r@web.de> writes:
> 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
Assuming that --track option is marked with PARSE_OPT_OPTARG and
when the option is given, we internally do a rev-parse of both
upstream and start-point and make sure the tip of the "track" is an
ancestor of the "start-point", I think it makes sense. That would
catch cases like this:
git checkout --detach origin/master
... work work work ...
git checkout -b new-branch --track=origin/master HEAD
On the other hand, some use case might want to go the other way, e.g.
git checkout --detach origin/master~12
... work to fix an older bug ...
git checkout -b new-branch --track=origin/master HEAD
in which case the start-point and the current tip of the tracking
branch has no relation other than they share a common ancestor.
So, should we allow a random upstream & start-point combination? It
appears to me that as long as they share _some_ common ancestory, it
may make sense.
next prev parent reply other threads:[~2020-05-24 16:15 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 ` 'HEAD' is not a commit (according to git-checkout) René Scharfe
2020-05-24 16:15 ` Junio C Hamano [this message]
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=xmqqimglqpga.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=dahlstrom@google.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--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).