@matheusbsbs / matheus-bagliano / commits / cf424f5fd8

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>

Jeff King committed Mar 10, 2014 at 16:37 UTC cf424f5fd89bb5cd09b24c96633f8951b6fd7b54

2 files changed +19 -2

builtin/clean.c

+3 -2

@@ -964,14 +964,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)

964 matches = match_pathspec_depth(&pathspec, ent->name,

965 len, 0, NULL);

966

967 + if (pathspec.nr && !matches)

968 + continue;

969 +

970 if (S_ISDIR(st.st_mode)) {

971 if (remove_directories || (matches == MATCHED_EXACTLY)) {

972 rel = relative_path(ent->name, prefix, &buf);

973 string_list_append(&del_list, rel);

974 }

975 } else {

973 - if (pathspec.nr && !matches)

974 - continue;

976 rel = relative_path(ent->name, prefix, &buf);

977 string_list_append(&del_list, rel);

978 }

t/t7300-clean.sh

+16

@@ -511,4 +511,20 @@ test_expect_success SANITY 'git clean -d with an unreadable empty directory' '

511 ! test -d foo

512 '

513

514 +test_expect_success 'git clean -d respects pathspecs (dir is prefix of pathspec)' '

515 + mkdir -p foo &&

516 + mkdir -p foobar &&

517 + git clean -df foobar &&

518 + test_path_is_dir foo &&

519 + test_path_is_missing foobar

520 +'

521 +

522 +test_expect_success 'git clean -d respects pathspecs (pathspec is prefix of dir)' '

523 + mkdir -p foo &&

524 + mkdir -p foobar &&

525 + git clean -df foo &&

526 + test_path_is_missing foo &&

527 + test_path_is_dir foobar

528 +'

529 +

530 test_done