From: Patrick Marlier <patrick.marlier@gmail.com>
To: git@vger.kernel.org, newren@gmail.com
Cc: Patrick Marlier <patrick.marlier@gmail.com>
Subject: [PATCH v2 2/2] clean: avoid traversing into untracked dirs when unnecessary
Date: Mon, 21 Feb 2022 10:00:34 +0100 [thread overview]
Message-ID: <20220221090034.4615-2-patrick.marlier@gmail.com> (raw)
In-Reply-To: <20220221090034.4615-1-patrick.marlier@gmail.com>
When deleting all untracked and ignored files and any nested
repositories (such as with `git clean -ffdx`), we do not need to recurse
into an untracked directory to see if any of the entries under it are
ignored or a nested repository. Special case this condition to avoid
unnecessary recursion.
---
builtin/clean.c | 4 +++-
t/t7300-clean.sh | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 18b37e3fd9..1b1454d052 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -978,7 +978,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
remove_directories = 1;
}
- if (remove_directories && !ignored_only) {
+ if (remove_directories && ignored && !exclude_list.nr && force > 1)
+ ; /* No need to recurse to look for ignored files */
+ else if (remove_directories && !ignored_only) {
/*
* We need to know about ignored files too:
*
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 0399701e62..ceab7c4883 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -788,4 +788,28 @@ test_expect_success 'traverse into directories that may have ignored entries' '
)
'
+test_expect_success 'avoid traversing into untracked directories' '
+ test_when_finished rm -f output error trace.* &&
+ git init avoid-traversing-untracked-hierarchy &&
+ (
+ cd avoid-traversing-untracked-hierarchy &&
+
+ mkdir -p untracked/subdir/with/b &&
+ mkdir -p untracked/subdir/with/a &&
+ >untracked/subdir/with/a/random-file.txt &&
+
+ GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+ git clean -ffdx
+ ) &&
+
+ # Make sure we only visited into the top-level directory, and did
+ # not traverse into the "untracked" subdirectory since it was excluded
+ grep data.*read_directo.*directories-visited trace.output |
+ cut -d "|" -f 9 >trace.relevant &&
+ cat >trace.expect <<-EOF &&
+ ..directories-visited:1
+ EOF
+ test_cmp trace.expect trace.relevant
+'
+
test_done
--
2.35.1
next prev parent reply other threads:[~2022-02-21 17:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 9:00 [PATCH v2 1/2] clean: avoid looking for nested repositories when unnecessary Patrick Marlier
2022-02-21 9:00 ` Patrick Marlier [this message]
2022-02-22 1:48 ` [PATCH v2 2/2] clean: avoid traversing into untracked dirs " Elijah Newren
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=20220221090034.4615-2-patrick.marlier@gmail.com \
--to=patrick.marlier@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@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).