diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:31 -0700 |
commit | 6eacc39b6d2508b6a7522902330c29714c99f5f2 (patch) | |
tree | eb45e53464fed0f3251b6e81d4ea39fc87df3e65 /builtin/grep.c | |
parent | Merge branch 'en/sparse-checkout' (diff) | |
parent | completion: fix 'git add' on paths under an untracked directory (diff) | |
download | tgif-6eacc39b6d2508b6a7522902330c29714c99f5f2.tar.xz |
Merge branch 'en/fill-directory-exponential'
The directory traversal code had redundant recursive calls which
made its performance characteristics exponential with respect to
the depth of the tree, which was corrected.
* en/fill-directory-exponential:
completion: fix 'git add' on paths under an untracked directory
Fix error-prone fill_directory() API; make it only return matches
dir: replace double pathspec matching with single in treat_directory()
dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()
dir: replace exponential algorithm with a linear one
dir: refactor treat_directory to clarify control flow
dir: fix confusion based on variable tense
dir: fix broken comment
dir: consolidate treat_path() and treat_one_path()
dir: fix simple typo in comment
t3000: add more testcases testing a variety of ls-files issues
t7063: more thorough status checking
Diffstat (limited to 'builtin/grep.c')
-rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index bdf1a4bbc9..5e150f5825 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -701,8 +701,6 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, fill_directory(&dir, opt->repo->index, pathspec); for (i = 0; i < dir.nr; i++) { - if (!dir_path_match(opt->repo->index, dir.entries[i], pathspec, 0, NULL)) - continue; hit |= grep_file(opt, dir.entries[i]->name); if (hit && opt->status_only) break; |