summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-03-14 14:46:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-15 18:15:54 -0700
commit15cdc6477634e0227e4211de464c6443a68172c9 (patch)
treefcdc3d3d72371aa687e4bc9f4e2e26c633ed3c50 /builtin
parentlib-submodule-update.sh: define tests for recursing into submodules (diff)
downloadtgif-15cdc6477634e0227e4211de464c6443a68172c9.tar.xz
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')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 2c727ef499..b17835aed6 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.