From: Taylor Blau <me@ttaylorr.com>
To: Ilias Apostolou <ilias.apostolou.zero@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Request feature: –no-submodule
Date: Wed, 2 Jun 2021 16:31:04 -0400 [thread overview]
Message-ID: <YLfqiLbpPXWXHlBi@nand.local> (raw)
In-Reply-To: <c5709df6-c357-56b4-f0e0-673bc8b4e668@gmail.com>
On Wed, Jun 02, 2021 at 01:31:11PM +0300, Ilias Apostolou wrote:
> Hello Git community.
>
> As you already know, git ls-files command lists all of the tracked files,
> but submodule names are included.
>
> My team would like a –no-submodule switch to exclude those.
In all honesty, though this seems like a niche request for ls-files to
fulfill, ls-files already has quite the collection of options, so I
wouldn't be sad to see it learn how to do this, too.
The change boils down to having builtin/ls-files.c:show_ce() avoid
printing out submoudles in when '--exclude-submoudles' is given).
Something like this:
--- >8 ---
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 45cc3b23dd..09d76fd068 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -35,6 +35,7 @@ static int show_fsmonitor_bit;
static int line_terminator = '\n';
static int debug_mode;
static int show_eol;
+static int exclude_submodules;
static int recurse_submodules;
static int skipping_duplicates;
@@ -230,6 +231,9 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
if (max_prefix_len > strlen(fullname))
die("git ls-files: internal error - cache entry not superset of prefix");
+ if (exclude_submodules && S_ISGITLINK(ce->ce_mode))
+ return;
+
if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
is_submodule_active(repo, ce->name)) {
show_submodule(repo, dir, ce->name);
@@ -662,6 +666,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_SET_INT_F(0, "full-name", &prefix_len,
N_("make the output relative to the project top directory"),
0, PARSE_OPT_NONEG),
+ OPT_BOOL(0, "exclude-submodules", &exclude_submodules,
+ N_("avoid showing submodules altogether")),
OPT_BOOL(0, "recurse-submodules", &recurse_submodules,
N_("recurse through submodules")),
OPT_BOOL(0, "error-unmatch", &error_unmatch,
--- 8< ---
I'll leave it at that to decide if others think this is a good idea or
not.
Thanks,
Taylor
next prev parent reply other threads:[~2021-06-02 20:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 10:31 Request feature: –no-submodule Ilias Apostolou
2021-06-02 20:31 ` Taylor Blau [this message]
2021-06-03 0:55 ` Junio C Hamano
2021-06-03 2:33 ` Taylor Blau
2021-06-03 10:48 ` Ilias Apostolou
2021-06-03 22:06 ` Junio C Hamano
2021-06-03 17:40 ` Junio C Hamano
2021-06-03 19:22 ` Jeff King
2021-06-03 21:54 ` Junio C Hamano
2021-06-04 4:03 ` Jeff King
2021-06-04 5:06 ` Junio C Hamano
2021-06-05 5:45 ` Ilias Apostolou
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=YLfqiLbpPXWXHlBi@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=ilias.apostolou.zero@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).