summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-05 19:53:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-06 10:15:39 (GMT)
commit0d32c183b636ffba6462b21ed0c844b6cb887b3f (patch)
treee715096f34c71ed0a6195215ea514e25992ff788 /builtin
parent2c1eb104543265c2d26cf36303b35e426dcacf68 (diff)
downloadgit-0d32c183b636ffba6462b21ed0c844b6cb887b3f.zip
git-0d32c183b636ffba6462b21ed0c844b6cb887b3f.tar.gz
git-0d32c183b636ffba6462b21ed0c844b6cb887b3f.tar.bz2
dir: convert fill_directory to take an index
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/clean.c2
-rw-r--r--builtin/grep.c2
-rw-r--r--builtin/ls-files.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 0b52aec..36cad00 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -400,7 +400,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
}
/* This picks up the paths that are not tracked */
- baselen = fill_directory(&dir, &pathspec);
+ baselen = fill_directory(&dir, &the_index, &pathspec);
if (pathspec.nr)
seen = prune_directory(&dir, &pathspec, baselen);
}
diff --git a/builtin/clean.c b/builtin/clean.c
index 39866af..329b68c 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -930,7 +930,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
PATHSPEC_PREFER_CWD,
prefix, argv);
- fill_directory(&dir, &pathspec);
+ fill_directory(&dir, &the_index, &pathspec);
for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i];
diff --git a/builtin/grep.c b/builtin/grep.c
index 3ffb5b4..f282962 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -866,7 +866,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
if (exc_std)
setup_standard_excludes(&dir);
- fill_directory(&dir, pathspec);
+ fill_directory(&dir, &the_index, pathspec);
for (i = 0; i < dir.nr; i++) {
if (!dir_path_match(dir.entries[i], pathspec, 0, NULL))
continue;
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 7a8c568..61271b5 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -333,7 +333,7 @@ static void show_files(struct dir_struct *dir)
if (show_others || show_killed) {
if (!show_others)
dir->flags |= DIR_COLLECT_KILLED_ONLY;
- fill_directory(dir, &pathspec);
+ fill_directory(dir, &the_index, &pathspec);
if (show_others)
show_other_files(dir);
if (show_killed)