diff options
| author | Stefan Beller <sbeller@google.com> | 2018-03-28 15:35:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 09:44:51 -0700 |
| commit | 0c89fdd739183234f86fe2be03a0374705ed93ed (patch) | |
| tree | 22af2a3216e1c5f6ac2449262224c23a12f289ca /submodule.c | |
| parent | 3b8fb393bc32f8d96c2eb4c89349c864e5c56039 (diff) | |
| download | git-0c89fdd739183234f86fe2be03a0374705ed93ed.tar.gz | |
submodule-config: remove submodule_from_cache
This continues the story of bf12fcdf5e (submodule-config: store
the_submodule_cache in the_repository, 2017-06-22).
The previous patch taught submodule_from_path to take a repository into
account, such that submodule_from_{path, cache} are the same now.
Remove submodule_from_cache, migrating all its callers to
submodule_from_path.
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index 9279cff2d7..dac73d10a7 100644 --- a/submodule.c +++ b/submodule.c @@ -231,7 +231,7 @@ int is_submodule_active(struct repository *repo, const char *path) const struct string_list *sl; const struct submodule *module; - module = submodule_from_cache(repo, &null_oid, path); + module = submodule_from_path(repo, &null_oid, path); /* early return if there isn't a path->module mapping */ if (!module) @@ -1236,7 +1236,7 @@ static int get_next_submodule(struct child_process *cp, if (!S_ISGITLINK(ce->ce_mode)) continue; - submodule = submodule_from_cache(spf->r, &null_oid, ce->name); + submodule = submodule_from_path(spf->r, &null_oid, ce->name); if (!submodule) { const char *name = default_name_or_path(ce->name); if (name) { |