diff options
| author | Shawn Bohrer <shawn.bohrer@gmail.com> | 2008-04-14 22:14:09 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-14 23:14:58 -0700 |
| commit | f2d0df7148a1b9ee69bd69a365ffcd1965872451 (patch) | |
| tree | 744c03640836faf926e71766b030faab7942203f /builtin-clean.c | |
| parent | f669ac0be901e19a8948c9b04af63d23ebae8003 (diff) | |
| download | git-f2d0df7148a1b9ee69bd69a365ffcd1965872451.tar.gz | |
git clean: Don't automatically remove directories when run within subdirectory
When git clean is run from a subdirectory it should follow the normal
policy and only remove directories if they are passed in as a pathspec,
or -d is specified.
The fix is to send len which could be shorter than ent->len because we
have stripped the trailing '/' that read_directory adds. Additionaly
match_one() was modified to allow a name[] that is not NUL terminated.
This allows us to check if the name matched the pathspec exactly
instead of recursively.
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-clean.c')
| -rw-r--r-- | builtin-clean.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/builtin-clean.c b/builtin-clean.c index fefec3010c..6778a03ae4 100644 --- a/builtin-clean.c +++ b/builtin-clean.c @@ -95,7 +95,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix) for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; - int len, pos, matches; + int len, pos; + int matches = 0; struct cache_entry *ce; struct stat st; @@ -127,18 +128,18 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (pathspec) { memset(seen, 0, argc > 0 ? argc : 1); - matches = match_pathspec(pathspec, ent->name, ent->len, + matches = match_pathspec(pathspec, ent->name, len, baselen, seen); - } else { - matches = 0; } 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)) { + if (show_only && (remove_directories || + (matches == MATCHED_EXACTLY))) { printf("Would remove %s\n", qname); - } else if (remove_directories || matches) { + } else if (remove_directories || + (matches == MATCHED_EXACTLY)) { if (!quiet) printf("Removing %s\n", qname); if (remove_dir_recursively(&directory, 0) != 0) { |