From: Junio C Hamano <gitster@pobox.com>
To: Brandon Williams <bmwill@google.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH v2] ls-files: add pathspec matching for submodules
Date: Wed, 21 Sep 2016 10:49:48 -0700 [thread overview]
Message-ID: <xmqq37kt9m83.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqmvj19nyp.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 21 Sep 2016 10:12:14 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Brandon Williams <bmwill@google.com> writes:
>
>> On a similar but slightly different note. In general do we want
>> the pathspec '??b' to match against the sib/ directory and
>> subsequently have ls-files print all entries inside of the sib/
>> directory? (this is in the non-recursive case)
>
> I'd need to find time to dig a bit of history before I can give a
> firm opinion on this, but here is a knee-jerk version of my reaction.
In the context of what you are doing, i.e. "ls-files that recurses
into submodules", my opinion is that "ls-files --recurse-submodules"
should behave wrt pathspecs AS IF all the submodule contents are
flattened into a single index of the superproject.
In the sample scenario under discussion, i.e.
In the superproject we have these
$ git ls-files -s
100644 c489803d5bdec1755f650854fe7ef5ab7a3ee58d 0 .gitmodules
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sib/file
160000 1f5a0695289c500f25e7fa55e3ad27e394d1206b 0 sub
In 'sub' submodule we have this
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 file
such a flattend index would look like this:
100644 c489803d5bdec1755f650854fe7ef5ab7a3ee58d 0 .gitmodules
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sib/file
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/file
i.e. removing 'sub' submodule entry from the index of the
superproject and overlay everything in the submodule with sub/
prefixed to its path.
And with such an index, if and only if a path matches a pathspec,
"git ls-files --recurse-submodules" run at the toplevel with the
same pathspec should show the path. That means
$ git ls-files --recurse-submodules '??b'
would show nothing (not even 'sub'), while
$ git ls-files --recurse-submodules '??b*'
should show sib/file and sub/file. That is because that is how the
command without "--recurse-submodules" working on that flat index
would produce.
The "we have historically two kinds of pathspecs and they differ how
they work with wildcard" is a separate issue, I would think, even
though the result would affect what should happen in the above
example (i.e. if we said "either a pattern match or a literal match
to a leading directory path should make everything underneath
match", '??b' would make sib/<anything> and sub/<anything> to be
shown).
next prev parent reply other threads:[~2016-09-21 17:49 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-14 23:57 [RFC] extending pathspec support to submodules Brandon Williams
2016-09-15 11:57 ` Heiko Voigt
2016-09-15 15:26 ` Brandon Williams
2016-09-15 22:08 ` Junio C Hamano
2016-09-15 22:28 ` Stefan Beller
2016-09-16 9:34 ` Heiko Voigt
2016-09-16 18:40 ` Brandon Williams
2016-09-17 0:59 ` [PATCH] ls-files: add pathspec matching for submodules Brandon Williams
2016-09-17 3:46 ` Junio C Hamano
2016-09-18 18:40 ` Brandon Williams
2016-09-19 17:00 ` Junio C Hamano
2016-09-19 17:26 ` Brandon Williams
2016-09-19 18:04 ` Junio C Hamano
2016-09-19 18:20 ` Brandon Williams
2016-09-19 18:22 ` Junio C Hamano
2016-09-19 18:30 ` Brandon Williams
2016-09-19 18:34 ` Junio C Hamano
2016-09-19 18:35 ` Brandon Williams
2016-09-19 18:52 ` [PATCH v2] " Brandon Williams
2016-09-19 23:21 ` Junio C Hamano
2016-09-20 16:30 ` Brandon Williams
2016-09-20 21:03 ` Brandon Williams
2016-09-21 17:12 ` Junio C Hamano
2016-09-21 17:49 ` Junio C Hamano [this message]
2016-09-19 18:18 ` [PATCH] " 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=xmqq37kt9m83.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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.
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).