From: Junio C Hamano <gitster@pobox.com>
To: Brandon Williams <bmwill@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] ls-files: add pathspec matching for submodules
Date: Mon, 19 Sep 2016 11:18:35 -0700 [thread overview]
Message-ID: <xmqqwpi7eosk.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1474073981-96620-1-git-send-email-bmwill@google.com> (Brandon Williams's message of "Fri, 16 Sep 2016 17:59:41 -0700")
Brandon Williams <bmwill@google.com> writes:
> static void show_ce_entry(const char *tag, const struct cache_entry *ce)
> {
> + struct strbuf name = STRBUF_INIT;
> int len = max_prefix_len;
> + if (submodule_prefix)
> + strbuf_addstr(&name, submodule_prefix);
> + strbuf_addstr(&name, ce->name);
Continuing with the previous review, which concentrated on what
happens in the superproject; let's see what happens in the recursive
invocation in a submodule.
So a recursively spawned "ls-files --submodule-prefix=sub/" finds
a path in the index PATH and forms "sub/PATH" in "name". From here
on, where we used to match pathspec against ce->name, we would be
matching it against name->buf.
> + if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
> + submodule_path_match(&pathspec, name.buf, ps_matched)) {
> show_gitlink(ce);
This is primarily what happens in the superproject to decide if the
submodule is worth showing. When we are in a submodule, we can
descend into subsubmodule (if our ls-files run in the superproject
passed --recurse-submodule down) from here.
> + } else if (match_pathspec(&pathspec, name.buf, name.len,
> + len, ps_matched,
> + S_ISDIR(ce->ce_mode) ||
> + S_ISGITLINK(ce->ce_mode))) {
This is interesting bit to see what happens in the recursive
invocation. It uses the usual match_pathspec(), as we want to be
precise and correct, iow, we do not want to use DO_MATCH_SUBMODULE,
aka "it might be worth descending into submodule".
> + if (tag && *tag && show_valid_bit &&
> + (ce->ce_flags & CE_VALID)) {
> +...
> + }
> + write_eolinfo(ce, ce->name);
> + write_name(ce->name);
The prefixing is taken care of by write_name(), so it is correct to
use ce->name here.
> ...
> + strbuf_release(&name);
> }
OK, everything I saw so far for the recursive invocation here makes
sense.
Thanks.
prev parent reply other threads:[~2016-09-19 18:18 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
2016-09-19 18:18 ` Junio C Hamano [this message]
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=xmqqwpi7eosk.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
/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).