From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, git@vger.kernel.org
Subject: Re: [BUG?] git checkout $commit -- somedir doesn't drop files
Date: Tue, 17 Sep 2013 16:13:00 -0400 [thread overview]
Message-ID: <20130917201259.GB16860@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqeh8nxltc.fsf@gitster.dls.corp.google.com>
On Tue, Sep 17, 2013 at 12:58:07PM -0700, Junio C Hamano wrote:
> I could argue that the above intended behaviour is suboptimal and it
> should have been "the resulting paths in the index and the work tree
> that match the given pathspec must be identical to that of the
> tree-ish". In the resulting index or working tree, paths that match
> "subdir" pathspec in the above result is subdir/a and subdir/b, and
> that is different from what exists in the given tree-ish (which has
> only subdir/a and not subdir/b), and under that modified definition,
> what the current one does is not correct.
Our emails just crossed, but I basically ended up saying a similar
thing. Could we simply replace the "update_some" in builtin/checkout.c
with a two-way merge via unpack-trees?
> I vaguely recall arguing for the updated behaviour described in the
> above paragraph, and I even might have started working on it, but I
> do not think we changed this behaviour recently, unfortunately.
Yes, I did some digging and I think it has always been this way, even
before git-checkout was a builtin.
-Peff
next prev parent reply other threads:[~2013-09-17 20:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-17 19:06 [BUG?] git checkout $commit -- somedir doesn't drop files Uwe Kleine-König
2013-09-17 19:58 ` Junio C Hamano
2013-09-17 20:13 ` Jeff King [this message]
2013-09-17 20:27 ` Junio C Hamano
2013-09-17 20:29 ` Jeff King
2013-09-17 20:40 ` Junio C Hamano
2013-09-17 21:21 ` Jeff King
2013-09-17 22:00 ` Junio C Hamano
2013-09-17 22:03 ` Jeff King
2013-09-17 22:14 ` Junio C Hamano
2013-09-19 7:46 ` Jeff King
2013-09-19 18:02 ` Junio C Hamano
2013-09-19 22:13 ` Jeff King
2013-09-20 22:54 ` Junio C Hamano
2013-09-17 20:10 ` Jeff King
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=20130917201259.GB16860@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=u.kleine-koenig@pengutronix.de \
/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).