| Message ID | 20190912221240.18057-7-newren@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix some git clean issues | expand |
Elijah Newren <newren@gmail.com> writes: > For git clean, if a directory is entirely untracked and the user did not > specify -d (corresponding to DIR_SHOW_IGNORED_TOO), then we usually do > not want to remove that directory and thus do not recurse into it. Makes sense. To clean named paths in such a directory, we'd need an option to recurse into it to find them, yet make sure the directory itself does not get removed. > However, if the user manually specified specific (or even globbed) paths > somewhere under that directory to remove, then we need to recurse into > the directory to make sure we remove the relevant paths under that > directory as the user requested. Surely. > @@ -1939,8 +1939,10 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, > /* recurse into subdir if instructed by treat_path */ > if ((state == path_recurse) || > ((state == path_untracked) && > - (dir->flags & DIR_SHOW_IGNORED_TOO) && > - (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR))) { > + (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR) && > + ((dir->flags & DIR_SHOW_IGNORED_TOO) || > + do_match_pathspec(istate, pathspec, path.buf, path.len, > + baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC))) { > struct untracked_cache_dir *ud; > ud = lookup_untracked(dir->untracked, untracked, > path.buf + baselen, OK. > diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh > index 12617158db..d83aeb7dc2 100755 > --- a/t/t7300-clean.sh > +++ b/t/t7300-clean.sh > @@ -691,7 +691,7 @@ test_expect_failure 'git clean -d skips nested repo containing ignored files' ' > test_path_is_file nested-repo-with-ignored-file/file > ' > > -test_expect_failure 'git clean handles being told what to clean' ' > +test_expect_success 'git clean handles being told what to clean' ' > mkdir -p d1 d2 && > touch d1/ut d2/ut && > git clean -f */ut && > @@ -707,7 +707,7 @@ test_expect_success 'git clean handles being told what to clean, with -d' ' > test_path_is_missing d2/ut > ' > > -test_expect_failure 'git clean works if a glob is passed without -d' ' > +test_expect_success 'git clean works if a glob is passed without -d' ' > mkdir -p d1 d2 && > touch d1/ut d2/ut && > git clean -f "*ut" && Nice. Thanks.
diff --git a/dir.c b/dir.c index b4d656192e..47c0a99cb5 100644 --- a/dir.c +++ b/dir.c @@ -360,7 +360,7 @@ static int match_pathspec_item(const struct index_state *istate, if ((namelen < matchlen) && (match[namelen-offset] == '/') && !ps_strncmp(item, match, name, namelen)) - return MATCHED_RECURSIVELY; + return MATCHED_RECURSIVELY_LEADING_PATHSPEC; /* name" doesn't match up to the first wild character */ if (item->nowildcard_len < item->len && @@ -377,7 +377,7 @@ static int match_pathspec_item(const struct index_state *istate, * The submodules themselves will be able to perform more * accurate matching to determine if the pathspec matches. */ - return MATCHED_RECURSIVELY; + return MATCHED_RECURSIVELY_LEADING_PATHSPEC; } return 0; @@ -1939,8 +1939,10 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, /* recurse into subdir if instructed by treat_path */ if ((state == path_recurse) || ((state == path_untracked) && - (dir->flags & DIR_SHOW_IGNORED_TOO) && - (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR))) { + (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR) && + ((dir->flags & DIR_SHOW_IGNORED_TOO) || + do_match_pathspec(istate, pathspec, path.buf, path.len, + baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC))) { struct untracked_cache_dir *ud; ud = lookup_untracked(dir->untracked, untracked, path.buf + baselen, diff --git a/dir.h b/dir.h index 680079bbe3..46c238ab49 100644 --- a/dir.h +++ b/dir.h @@ -211,8 +211,9 @@ int count_slashes(const char *s); * when populating the seen[] array. */ #define MATCHED_RECURSIVELY 1 -#define MATCHED_FNMATCH 2 -#define MATCHED_EXACTLY 3 +#define MATCHED_RECURSIVELY_LEADING_PATHSPEC 2 +#define MATCHED_FNMATCH 3 +#define MATCHED_EXACTLY 4 int simple_length(const char *match); int no_wildcard(const char *string); char *common_prefix(const struct pathspec *pathspec); diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 12617158db..d83aeb7dc2 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -691,7 +691,7 @@ test_expect_failure 'git clean -d skips nested repo containing ignored files' ' test_path_is_file nested-repo-with-ignored-file/file ' -test_expect_failure 'git clean handles being told what to clean' ' +test_expect_success 'git clean handles being told what to clean' ' mkdir -p d1 d2 && touch d1/ut d2/ut && git clean -f */ut && @@ -707,7 +707,7 @@ test_expect_success 'git clean handles being told what to clean, with -d' ' test_path_is_missing d2/ut ' -test_expect_failure 'git clean works if a glob is passed without -d' ' +test_expect_success 'git clean works if a glob is passed without -d' ' mkdir -p d1 d2 && touch d1/ut d2/ut && git clean -f "*ut" &&
For git clean, if a directory is entirely untracked and the user did not specify -d (corresponding to DIR_SHOW_IGNORED_TOO), then we usually do not want to remove that directory and thus do not recurse into it. However, if the user manually specified specific (or even globbed) paths somewhere under that directory to remove, then we need to recurse into the directory to make sure we remove the relevant paths under that directory as the user requested. Note that this does not mean that the recursed-into directory will be added to dir->entries for later removal; as of a few commits earlier in this series, there is another more strict match check that is run after returning from a recursed-into directory before deciding to add it to the list of entries. Therefore, this will only result in files underneath the given directory which match one of the pathspecs being added to the entries list. Two notes of potential interest to future readers: * If we wanted to only recurse into a directory when it is specifically matched rather than matched-via-glob (e.g. '*.c'), then we could do so via making the final non-zero return in match_pathspec_item be MATCHED_RECURSIVELY instead of MATCHED_RECURSIVELY_LEADING_PATHSPEC. (Note that the relative order of MATCHED_RECURSIVELY_LEADING_PATHSPEC and MATCHED_RECURSIVELY are important for such a change.) I was leaving open that possibility while writing an RFC asking for the behavior we want, but even though we don't want it, that knowledge might help you understand the code flow better. * There is a growing amount of logic in read_directory_recursive() for deciding whether to recurse into a subdirectory. However, there is a comment immediately preceding this logic that says to recurse if instructed by treat_path(). It may be better for the logic in read_directory_recursive() to ultimately be moved to treat_path() (or another function it calls, such as treat_directory()), but I have left that for someone else to tackle in the future. Signed-off-by: Elijah Newren <newren@gmail.com> --- dir.c | 10 ++++++---- dir.h | 5 +++-- t/t7300-clean.sh | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-)