From: Jeff King <peff@peff.net>
To: Robin Pedersen <robinp@snap.tv>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] clean: respect pathspecs with "-d"
Date: Mon, 10 Mar 2014 13:22:15 -0400 [thread overview]
Message-ID: <20140310172215.GC29801@sigill.intra.peff.net> (raw)
In-Reply-To: <20140310172002.GB29801@sigill.intra.peff.net>
On Mon, Mar 10, 2014 at 01:20:02PM -0400, Jeff King wrote:
> On Mon, Mar 10, 2014 at 11:31:37AM +0100, Robin Pedersen wrote:
>
> > I accidentially deleted a directory using git clean. I would think
> > this is a bug, but I'm not sure. Was using 1.8.1, but upgraded to
> > 1.9.0 just to see if it was still reproducable, and it was.
>
> Definitely a bug, and it dates back quite a while. Thanks for a very
> clear bug report.
>
> -- >8 --
Whoops, accidentally included a scissors line here that will break
people using "git am --scissors" to pick up the patch. Here it is
correctly formatted.
-- >8 --
Subject: clean: respect pathspecs with "-d"
git-clean uses read_directory to fill in a `struct dir` with
potential hits. However, read_directory does not actually
check against our pathspec. It uses a simplified version
that may turn up false positives. As a result, we need to
check that any hits match our pathspec. We do so reliably
for non-directories. For directories, if "-d" is not given
we check that the pathspec matched exactly (i.e., we are
even stricter, and require an explicit "git clean foo" to
clean "foo/"). But if "-d" is given, rather than relaxing
the exact match to allow a recursive match, we do not check
the pathspec at all.
This regression was introduced in 113f10f (Make git-clean a
builtin, 2007-11-11).
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/clean.c | 5 +++--
t/t7300-clean.sh | 8 ++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 114d7bf..31c1488 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -947,14 +947,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (pathspec.nr)
matches = dir_path_match(ent, &pathspec, 0, NULL);
+ if (pathspec.nr && !matches)
+ continue;
+
if (S_ISDIR(st.st_mode)) {
if (remove_directories || (matches == MATCHED_EXACTLY)) {
rel = relative_path(ent->name, prefix, &buf);
string_list_append(&del_list, rel);
}
} else {
- if (pathspec.nr && !matches)
- continue;
rel = relative_path(ent->name, prefix, &buf);
string_list_append(&del_list, rel);
}
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 710be90..0c602de 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -511,4 +511,12 @@ test_expect_success SANITY 'git clean -d with an unreadable empty directory' '
! test -d foo
'
+test_expect_success 'git clean -d respects pathspecs' '
+ mkdir foo &&
+ mkdir foobar &&
+ git clean -df foobar &&
+ test_path_is_dir foo &&
+ test_path_is_missing foobar
+'
+
test_done
--
1.9.0.403.g7a2f4b0
next prev parent reply other threads:[~2014-03-10 17:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 10:31 Accidentially deleted directory, bug in git clean -d? Robin Pedersen
2014-03-10 17:20 ` [PATCH] clean: respect pathspecs with "-d" Jeff King
2014-03-10 17:22 ` Jeff King [this message]
2014-03-10 20:02 ` Simon Ruderich
2014-03-10 20:37 ` Jeff King
2014-03-10 17:24 ` [PATCH] clean: simplify dir/not-dir logic Jeff King
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=20140310172215.GC29801@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=robinp@snap.tv \
/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).