From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Cláudio Lourenço" <pt.smooke@gmail.com>,
Leila <muhtasib@gmail.com>,
konglu@minatec.inpg.fr, git@vger.kernel.org,
"Renato Neves" <nevrenato@gmail.com>
Subject: Re: Help understanding git checkout behavior
Date: Mon, 11 Jun 2012 17:58:09 -0400 [thread overview]
Message-ID: <20120611215808.GA6832@sigill.intra.peff.net> (raw)
In-Reply-To: <20120611214705.GC32061@sigill.intra.peff.net>
On Mon, Jun 11, 2012 at 05:47:05PM -0400, Jeff King wrote:
> > I just checked the history of unpack-trees code (which is the
> > underlying machinery of read-tree, which in turn is the machinery
> > used to check out another branch by "git checkout"), and I suspect
> > that this particular case has never worked.
>
> Yeah, I verified it back to v1.6.x, but didn't bother going further
> back.
Actually, it was broken by c819353 (Fix switching to a branch with D/F
when current branch has file D., 2007-03-15).
However, before that the check was too tight, and says:
fatal: Untracked working tree file 'something' would be removed by merge.
which is not really correct, either.
-Peff
next prev parent reply other threads:[~2012-06-11 21:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-11 16:52 Help understanding git checkout behavior Cláudio Lourenço
2012-06-11 17:07 ` Konstantin Khomoutov
2012-06-11 18:21 ` konglu
2012-06-11 18:34 ` Leila
2012-06-11 18:55 ` Jeff King
2012-06-11 18:56 ` Junio C Hamano
2012-06-11 20:48 ` Cláudio Lourenço
2012-06-11 21:04 ` Junio C Hamano
2012-06-11 21:34 ` Junio C Hamano
2012-06-11 21:47 ` Jeff King
2012-06-11 21:58 ` Jeff King [this message]
2012-06-11 22:45 ` Junio C Hamano
2012-06-11 18:52 ` Vincent van Ravesteijn
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120611215808.GA6832@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=konglu@minatec.inpg.fr \
--cc=muhtasib@gmail.com \
--cc=nevrenato@gmail.com \
--cc=pt.smooke@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.
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 NNTP newsgroup(s).