diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 08:35:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 17:56:08 (GMT) |
| commit | 7327d3d1b70bfde70840aa8970fe70de6ef1be16 (patch) | |
| tree | 5740ac2d065dfc60e17f042959497dcf53af1e20 /builtin | |
| parent | 9b2d61499b4ff9ded3e1f3d535912ce04c21d72e (diff) | |
| download | git-7327d3d1b70bfde70840aa8970fe70de6ef1be16.zip git-7327d3d1b70bfde70840aa8970fe70de6ef1be16.tar.gz git-7327d3d1b70bfde70840aa8970fe70de6ef1be16.tar.bz2 | |
convert {read,fill}_directory to take struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 4 | ||||
| -rw-r--r-- | builtin/clean.c | 2 | ||||
| -rw-r--r-- | builtin/grep.c | 2 | ||||
| -rw-r--r-- | builtin/ls-files.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/builtin/add.c b/builtin/add.c index f5d6a33..34c9358 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -507,6 +507,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (add_new_files) { int baselen; + struct pathspec empty_pathspec; /* Set up the default git porcelain excludes */ memset(&dir, 0, sizeof(dir)); @@ -515,8 +516,9 @@ int cmd_add(int argc, const char **argv, const char *prefix) setup_standard_excludes(&dir); } + memset(&empty_pathspec, 0, sizeof(empty_pathspec)); /* This picks up the paths that are not tracked */ - baselen = fill_directory(&dir, implicit_dot ? NULL : pathspec.raw); + baselen = fill_directory(&dir, implicit_dot ? &empty_pathspec : &pathspec); if (pathspec.nr) seen = prune_directory(&dir, pathspec.raw, baselen, implicit_dot ? WARN_IMPLICIT_DOT : 0); diff --git a/builtin/clean.c b/builtin/clean.c index fdd4980..d540ca4 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -214,7 +214,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) PATHSPEC_PREFER_CWD, prefix, argv); - fill_directory(&dir, pathspec.raw); + fill_directory(&dir, &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 4bc0754..76a6a60 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -523,7 +523,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, if (exc_std) setup_standard_excludes(&dir); - fill_directory(&dir, pathspec->raw); + fill_directory(&dir, pathspec); for (i = 0; i < dir.nr; i++) { const char *name = dir.entries[i]->name; int namelen = strlen(name); diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 50e6edf..fa1a6be 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir) /* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) { - fill_directory(dir, pathspec.raw); + fill_directory(dir, &pathspec); if (show_others) show_other_files(dir); if (show_killed) |