git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: "Randall S. Becker" <rsbecker@nexbridge.com>
Cc: "'Junio C Hamano'" <gitster@pobox.com>,
	"'René Scharfe'" <l.s.r@web.de>,
	"'Dana Dahlstrom'" <dahlstrom@google.com>,
	git@vger.kernel.org
Subject: Re: 'HEAD' is not a commit (according to git-checkout)
Date: Wed, 27 May 2020 13:31:52 -0400	[thread overview]
Message-ID: <20200527173152.GA4019609@coredump.intra.peff.net> (raw)
In-Reply-To: <022e01d6343e$d6c045b0$8440d110$@nexbridge.com>

On Wed, May 27, 2020 at 11:52:28AM -0400, Randall S. Becker wrote:

> On May 27, 2020 11:44 AM, Junio C Hamano wrote:
> > Jeff King <peff@peff.net> writes:
> > 
> > > On Sun, May 24, 2020 at 09:15:33AM -0700, Junio C Hamano wrote:
> > >
> > >> 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.
> > >
> > > But wouldn't just about any two tips in a repository share some common
> > > ancestry?
> > 
> > Yes, we are on the same page; the above was my round-about way to say
> > that it does not look useful to restrict the allowed combination in order to
> > give us some safety.
> 
> I have seen some strange ones, as part of migrating from other SCM
> solutions to git, where there were two completely unrelated histories
> - at least temporarily until stitched together towards the end of the
> migration. I don't think the assumption about common ancestry holds
> generally. I might have misunderstood, though.

No, I don't think you've misunderstood. It does happen, and there's even
an example in git.git. Doing:

  git checkout -b new-branch --track=origin/todo origin/master

would be nonsense. But it's a rare enough case that I don't think it's
worth worrying too much about. Plus it's pretty easy to undo, or at
least no harder than lots of other mistakes (e.g., trying to rebase on
the wrong branch).

-Peff

  reply	other threads:[~2020-05-27 17:31 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
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 [this message]
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=20200527173152.GA4019609@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=dahlstrom@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=l.s.r@web.de \
    --cc=rsbecker@nexbridge.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).