mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'jk/clean-d-pathspec' into maint
"git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d"
This commit is contained in:
commit
9526473f11
|
@ -946,17 +946,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|||
if (pathspec.nr)
|
||||
matches = dir_path_match(ent, &pathspec, 0, NULL);
|
||||
|
||||
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);
|
||||
}
|
||||
if (pathspec.nr && !matches)
|
||||
continue;
|
||||
|
||||
if (S_ISDIR(st.st_mode) && !remove_directories &&
|
||||
matches != MATCHED_EXACTLY)
|
||||
continue;
|
||||
|
||||
rel = relative_path(ent->name, prefix, &buf);
|
||||
string_list_append(&del_list, rel);
|
||||
}
|
||||
|
||||
if (interactive && del_list.nr > 0)
|
||||
|
|
|
@ -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