summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-03-14 21:46:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-16 01:15:54 (GMT)
commit15cdc6477634e0227e4211de464c6443a68172c9 (patch)
treefcdc3d3d72371aa687e4bc9f4e2e26c633ed3c50 /builtin/grep.c
parent259f3ee29666eddf65fb0fe0e3fd14aa22f33cba (diff)
downloadgit-15cdc6477634e0227e4211de464c6443a68172c9.zip
git-15cdc6477634e0227e4211de464c6443a68172c9.tar.gz
git-15cdc6477634e0227e4211de464c6443a68172c9.tar.bz2
make is_submodule_populated gently
We need the gentle version in a later patch. As we have just one caller, migrate the caller. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 2c727ef..b17835a 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -616,7 +616,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.