summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorLibravatar Matheus Tavares <matheus.bernardino@usp.br>2020-01-15 23:39:55 -0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-17 13:52:14 -0800
commitd7992421e1a0e3ea5f836d8906e0f8b197fb6c1e (patch)
tree5c6e3e4f5fa6c4dcedfc23f0537824585e17bc0d /builtin/grep.c
parentgrep: replace grep_read_mutex by internal obj read lock (diff)
downloadtgif-d7992421e1a0e3ea5f836d8906e0f8b197fb6c1e.tar.xz
submodule-config: add skip_if_read option to repo_read_gitmodules()
Currently, submodule-config.c doesn't have an externally accessible function to read gitmodules only if it wasn't already read. But this exact behavior is internally implemented by gitmodules_read_check(), to perform a lazy load. Let's merge this function with repo_read_gitmodules() adding a 'skip_if_read' which allows both internal and external callers to access this functionality. This simplifies a little the code. The added option will also be used in the following patch. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> 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 4a436d6c99..d3ed05c1da 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -420,7 +420,7 @@ static int grep_submodule(struct grep_opt *opt,
return 0;
}
- repo_read_gitmodules(&subrepo);
+ repo_read_gitmodules(&subrepo, 0);
/*
* NEEDSWORK: This adds the submodule's object directory to the list of