diff options
author | Jeff King <peff@peff.net> | 2014-03-10 16:37:30 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-11 12:13:42 -0700 |
commit | cf424f5fd89bb5cd09b24c96633f8951b6fd7b54 (patch) | |
tree | 87803e931b3873051ef9b89f59a33f5c4a582867 /t/t7300-clean.sh | |
parent | 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff) | |
download | git-cf424f5fd89bb5cd09b24c96633f8951b6fd7b54.tar.gz git-cf424f5fd89bb5cd09b24c96633f8951b6fd7b54.tar.xz |
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>
Diffstat (limited to 't/t7300-clean.sh')
-rwxr-xr-x | t/t7300-clean.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 710be9048..74de814ae 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -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 |