summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 21:05:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-28 21:05:58 (GMT)
commite394fa01d65a5e182639e226f5b46eca999cd8d7 (patch)
treeb202d6e4807998e130fbfd4ac315ac868e16c104 /builtin/grep.c
parentff8b7e63dede832e8a02ce632fc70dcb59bf2681 (diff)
parent25804914fa3661549cb4017fd0d127b9b626fc69 (diff)
downloadgit-e394fa01d65a5e182639e226f5b46eca999cd8d7.zip
git-e394fa01d65a5e182639e226f5b46eca999cd8d7.tar.gz
git-e394fa01d65a5e182639e226f5b46eca999cd8d7.tar.bz2
Merge branch 'sb/checkout-recurse-submodules'
"git checkout" is taught the "--recurse-submodules" option. * sb/checkout-recurse-submodules: builtin/read-tree: add --recurse-submodules switch builtin/checkout: add --recurse-submodules switch entry.c: create submodules when interesting unpack-trees: check if we can perform the operation for submodules unpack-trees: pass old oid to verify_clean_submodule update submodules: add submodule_move_head submodule.c: get_super_prefix_or_empty update submodules: move up prepare_submodule_repo_env submodules: introduce check to see whether to touch a submodule update submodules: add a config option to determine if submodules are updated update submodules: add submodule config parsing make is_submodule_populated gently lib-submodule-update.sh: define tests for recursing into submodules lib-submodule-update.sh: replace sha1 by hash lib-submodule-update: teach test_submodule_content the -C <dir> flag lib-submodule-update.sh: do not use ./. as submodule remote lib-submodule-update.sh: reorder create_lib_submodule_repo submodule--helper.c: remove duplicate code connect_work_tree_and_git_dir: safely create leading directories
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 a9e82dc..3f3efa9 100644
--- 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.