From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] checkout, restore: make pathspec recursive
Date: Mon, 24 Aug 2020 16:21:11 -0400 [thread overview]
Message-ID: <20200824202111.GA709709@coredump.intra.peff.net> (raw)
In-Reply-To: <7c5144d8-24cd-0d50-a7c6-ff77160d503d@web.de>
On Sat, Aug 22, 2020 at 10:57:59AM +0200, René Scharfe wrote:
> The pathspec given to git checkout and git restore is used with both
> tree_entry_interesting (via read_tree_recursive) and match_pathspec
> (via ce_path_match). The latter effectively only supports recursive
> matching regardless of the value of the pathspec flag "recursive",
> which is unset here.
>
> That causes different match results for pathspecs with wildcards, and
> can lead checkout and restore in no-overlay mode to remove entries
> instead of modifying them. Enable recursive matching for both checkout
> and restore to make matching consistent.
>
> Setting the flag in checkout_main() technically also affects git switch,
> but since that command doesn't accept pathspecs at all this has no
> actual consequence.
Thanks, I think this is the thing to do (and the code change looks
obviously correct ;) ).
This may cause a user-visible behavior change even in overlay mode
(because we'll now match some tree entries that we wouldn't before). But
I think it's an improvement, because it makes:
git checkout <tree> -- <paths>
consistent with:
git checkout -- <paths>
I don't know if you want to call that out more directly in the commit
message.
-Peff
next prev parent reply other threads:[~2020-08-24 20:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 18:51 Possible bug with git restore Sergii Shkarnikov
2020-08-14 22:41 ` Eric Sunshine
2020-08-20 12:59 ` Sergii Shkarnikov
2020-08-20 13:40 ` Jeff King
2020-08-20 17:48 ` René Scharfe
2020-08-20 18:27 ` Jeff King
2020-08-22 8:57 ` [PATCH] checkout, restore: make pathspec recursive René Scharfe
2020-08-24 20:21 ` Jeff King [this message]
2020-08-22 10:29 ` Possible bug with git restore René Scharfe
2020-08-24 20:25 ` Jeff King
2020-08-22 19:36 ` Junio C Hamano
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=20200824202111.GA709709@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=sergii.shkarnikov@globallogic.com \
--cc=sunshine@sunshineco.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).