diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-03-30 20:39:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-31 17:41:32 -0700 |
| commit | 9fc42d609197ef331f1c5b2ce5ef6fc9f2ee634f (patch) | |
| tree | b59890e73a673167a4db90d85782851464c758f1 /builtin-ls-files.c | |
| parent | d8b6a1a10b93666246984a50d64a163e71163aeb (diff) | |
| download | git-9fc42d609197ef331f1c5b2ce5ef6fc9f2ee634f.tar.gz | |
Optimize directory listing with pathspec limiter.
The way things are set up, you can now pass a "pathspec" to the
"read_directory()" function. If you pass NULL, it acts exactly
like it used to do (read everything). If you pass a non-NULL
pointer, it will simplify it into a "these are the prefixes
without any special characters", and stop any readdir() early if
the path in question doesn't match any of the prefixes.
NOTE! This does *not* obviate the need for the caller to do the *exact*
pathspec match later. It's a first-level filter on "read_directory()", but
it does not do the full pathspec thing. Maybe it should. But in the
meantime, builtin-add.c really does need to do first
read_directory(dir, .., pathspec);
if (pathspec)
prune_directory(dir, pathspec, baselen);
ie the "prune_directory()" part will do the *exact* pathspec pruning,
while the "read_directory()" will use the pathspec just to do some quick
high-level pruning of the directories it will recurse into.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-ls-files.c')
| -rw-r--r-- | builtin-ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index 4e1d5af634..74a6acacc1 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir, const char *prefix) if (baselen) path = base = prefix; - read_directory(dir, path, base, baselen); + read_directory(dir, path, base, baselen, pathspec); if (show_others) show_other_files(dir); if (show_killed) |