Merge branch 'jk/test-suite-tracing'

diff --git a/builtin/grep.c b/builtin/grep.c
index 5a6cfe6b45b06b6b75ea399a83cb8dcf7e197141..3ca4ac80d8c7014e7e9aba228f542113a5103b48 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1015,6 +1015,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                       prefix, argv + i);
        pathspec.max_depth = opt.max_depth;
        pathspec.recursive = 1;
+       pathspec.recurse_submodules = !!recurse_submodules;
 
 #ifndef NO_PTHREADS
        if (list.nr || cached || show_in_pager)