summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 20:47:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-18 20:47:57 (GMT)
commit15520a858f5c3468eaa7f9c844218714d3bc1687 (patch)
treed8dfba48ab92b5bd0430de48fe98f3664148a924
parent00eda23228acb68c85a76f977f4e59f82189ce3f (diff)
parent1f2e1088871e777355025a84f80a2d8b5cb04c06 (diff)
downloadgit-15520a858f5c3468eaa7f9c844218714d3bc1687.zip
git-15520a858f5c3468eaa7f9c844218714d3bc1687.tar.gz
git-15520a858f5c3468eaa7f9c844218714d3bc1687.tar.bz2
Merge branch 'jk/clean-d-pathspec'
"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"
-rw-r--r--builtin/clean.c20
-rwxr-xr-xt/t7300-clean.sh16
2 files changed, 25 insertions, 11 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 114d7bf..cf76b1f 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -947,17 +947,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)
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 710be90..74de814 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