submodule.c: add .gitmodules staging helper functions

diff --git a/builtin/grep.c b/builtin/grep.c
index 1a6c02804c7f027b1da668f25b948f0d3e951519..76a6a60906e4c26508a63950dc72b4250155e271 100644 (file)
--- 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);
@@ -858,7 +858,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        }
 
        parse_pathspec(&pathspec, 0,
-                      PATHSPEC_PREFER_CWD,
+                      PATHSPEC_PREFER_CWD |
+                      (opt.max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0),
                       prefix, argv + i);
        pathspec.max_depth = opt.max_depth;
        pathspec.recursive = 1;