mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7bbc4e8fdb
commit
cf424f5fd8
|
@ -964,14 +964,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|||
matches = match_pathspec_depth(&pathspec, ent->name,
|
||||
len, 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);
|
||||
}
|
||||
|
|
|
@ -511,4 +511,20 @@ test_expect_success SANITY 'git clean -d with an unreadable empty directory' '
|
|||
! test -d foo
|
||||
'
|
||||
|
||||
test_expect_success 'git clean -d respects pathspecs (dir is prefix of pathspec)' '
|
||||
mkdir -p foo &&
|
||||
mkdir -p foobar &&
|
||||
git clean -df foobar &&
|
||||
test_path_is_dir foo &&
|
||||
test_path_is_missing foobar
|
||||
'
|
||||
|
||||
test_expect_success 'git clean -d respects pathspecs (pathspec is prefix of dir)' '
|
||||
mkdir -p foo &&
|
||||
mkdir -p foobar &&
|
||||
git clean -df foo &&
|
||||
test_path_is_missing foo &&
|
||||
test_path_is_dir foobar
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue