diff options
| author | Brandon Williams <bmwill@google.com> | 2017-06-22 11:43:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-23 18:24:34 -0700 |
| commit | 627d9342fe38598c995578d57cec6cbad1dcbc69 (patch) | |
| tree | 1f2153e27ab14403f9d1d755da71c61a9b048df2 /builtin/grep.c | |
| parent | 69aba5329e3464bfe38d2614033e19c490f8694d (diff) | |
| download | git-627d9342fe38598c995578d57cec6cbad1dcbc69.tar.gz | |
submodule: convert is_submodule_initialized to work on a repository
Convert 'is_submodule_initialized()' to take a repository object and
while we're at it, lets rename the function to 'is_submodule_active()'
and remove the NEEDSWORK comment.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index f61a9d938b..e3ba1d98e3 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -4,6 +4,7 @@ * Copyright (c) 2006 Junio C Hamano */ #include "cache.h" +#include "repository.h" #include "config.h" #include "blob.h" #include "tree.h" @@ -643,7 +644,7 @@ static int grep_submodule_launch(struct grep_opt *opt, static int grep_submodule(struct grep_opt *opt, const struct object_id *oid, const char *filename, const char *path) { - if (!is_submodule_initialized(path)) + if (!is_submodule_active(the_repository, path)) return 0; if (!is_submodule_populated_gently(path, NULL)) { /* |