From: Joachim B Haga <jobh@broadpark•no>
To: git@vger•kernel.org
Subject: [PATCH] Re: git clean removes directories when not asked to
Date: Wed, 09 Apr 2008 19:04:15 +0200 [thread overview]
Message-ID: <85fxtvj6y8.fsf_-_@lupus.strangled.net> (raw)
In-Reply-To: 85k5j8jioc.fsf@lupus.strangled.net
Joachim B Haga <jobh@broadpark•no> writes:
> Joachim B Haga <jobh@broadpark•no> writes:
>
>> When invoked from a subdirectory, git clean removes more than it
>> should. According to the documentation, it should not remove
>> directories unless "-d" is given. However:
I have tried to fix this, but I don't know the code. The previous logic was
obviously (?) broken, as it had this (paraphrased):
if (remove_directories || matches)
remove_dir_recursively(...);
which should have been &&. But with only this change, top-level directories
were not removed even if "-d" was given. Looking at the (!ISDIR) branch, I
guessed that it should instead trigger if pathspec is NULL; i.e, generally
treat (!pathspec) as a match. It looks like the behaviour is correct now, but
somebody who knows this code should check my guesses.
-j.
>From 73647e7bb73b6037b9d14535ec027da8ee7d6091 Mon Sep 17 00:00:00 2001
From: Joachim B Haga <jobh@broadpark•no>
Date: Wed, 9 Apr 2008 18:49:34 +0200
Subject: [PATCH] Stop builtin-clean from removing directories unless "-d" is given.
---
builtin-clean.c | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/builtin-clean.c b/builtin-clean.c
index fefec30..15201d5 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -130,29 +130,32 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
matches = match_pathspec(pathspec, ent->name, ent->len,
baselen, seen);
} else {
- matches = 0;
+ matches = 1;
}
if (S_ISDIR(st.st_mode)) {
strbuf_addstr(&directory, ent->name);
qname = quote_path_relative(directory.buf, directory.len, &buf, prefix);
- if (show_only && (remove_directories || matches)) {
- printf("Would remove %s\n", qname);
- } else if (remove_directories || matches) {
- if (!quiet)
- printf("Removing %s\n", qname);
- if (remove_dir_recursively(&directory, 0) != 0) {
- warning("failed to remove '%s'", qname);
- errors++;
+ if (remove_directories && matches) {
+ if (show_only)
+ printf("Would remove %s\n", qname);
+ else {
+ if (!quiet)
+ printf("Removing %s\n", qname);
+ if (remove_dir_recursively(&directory, 0) != 0) {
+ warning("failed to remove '%s'", qname);
+ errors++;
+ }
}
- } else if (show_only) {
- printf("Would not remove %s\n", qname);
} else {
- printf("Not removing %s\n", qname);
+ if (show_only)
+ printf("Would not remove %s\n", qname);
+ else
+ printf("Not removing %s\n", qname);
}
strbuf_reset(&directory);
} else {
- if (pathspec && !matches)
+ if (!matches)
continue;
qname = quote_path_relative(ent->name, -1, &buf, prefix);
if (show_only) {
--
1.5.4.4
next prev parent reply other threads:[~2008-04-09 17:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-08 18:22 git clean removes directories when not asked to Joachim B Haga
2008-04-08 18:38 ` Joachim B Haga
2008-04-09 17:04 ` Joachim B Haga [this message]
2008-04-13 23:49 ` [PATCH] git clean: Don't automatically remove directories when run within subdirectory Shawn Bohrer
2008-04-13 23:49 ` [PATCH] git clean: Add test to verify directories aren't removed with a prefix Shawn Bohrer
2008-04-14 7:03 ` [PATCH] git clean: Don't automatically remove directories when run within subdirectory Joachim Berdal Haga
2008-04-14 7:18 ` Junio C Hamano
2008-04-14 17:06 ` Shawn Bohrer
2008-04-14 18:18 ` Joachim Berdal Haga
2008-04-15 3:44 ` Shawn Bohrer
2008-04-15 6:33 ` Joachim Berdal Haga
2008-04-15 14:26 ` Shawn Bohrer
2008-04-15 14:46 ` Joachim Berdal Haga
2008-04-15 3:14 ` Shawn Bohrer
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=85fxtvj6y8.fsf_-_@lupus.strangled.net \
--to=jobh@broadpark$(echo .)no \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox