Merge branch 'sb/checkout-recurse-submodules'

diff --git a/builtin/grep.c b/builtin/grep.c
index a9e82dc975e007fc2a77240ea1f9dca0803ecf32..3f3efa95de2570bcd4f51a29fc7936817b9cee23 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -618,7 +618,7 @@ static int grep_submodule(struct grep_opt *opt, const unsigned char *sha1,
 {
        if (!is_submodule_initialized(path))
                return 0;
-       if (!is_submodule_populated(path)) {
+       if (!is_submodule_populated_gently(path, NULL)) {
                /*
                 * If searching history, check for the presense of the
                 * submodule's gitdir before skipping the submodule.