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 | |
| parent | submodule-config: add repository argument to submodule_from_{name, path} (diff) | |
| download | tgif-0c89fdd739183234f86fe2be03a0374705ed93ed.tar.xz | |
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>
| -rw-r--r-- | repository.c | 2 | ||||
| -rw-r--r-- | submodule-config.c | 9 | ||||
| -rw-r--r-- | submodule-config.h | 3 | ||||
| -rw-r--r-- | submodule.c | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/repository.c b/repository.c index a4848c1bd0..eb5b8e9f5a 100644 --- a/repository.c +++ b/repository.c @@ -176,7 +176,7 @@ int repo_submodule_init(struct repository *submodule, struct strbuf worktree = STRBUF_INIT; int ret = 0; - sub = submodule_from_cache(superproject, &null_oid, path); + sub = submodule_from_path(superproject, &null_oid, path); if (!sub) { ret = -1; goto out; diff --git a/submodule-config.c b/submodule-config.c index 0ea1e927d2..9abe9166d5 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -635,15 +635,6 @@ const struct submodule *submodule_from_path(struct repository *r, return config_from(r->submodule_cache, treeish_name, path, lookup_path); } -const struct submodule *submodule_from_cache(struct repository *repo, - const struct object_id *treeish_name, - const char *key) -{ - gitmodules_read_check(repo); - return config_from(repo->submodule_cache, treeish_name, - key, lookup_path); -} - void submodule_free(struct repository *r) { if (r->submodule_cache) diff --git a/submodule-config.h b/submodule-config.h index 43dfe7dec0..6f686184e8 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -45,9 +45,6 @@ const struct submodule *submodule_from_name(struct repository *r, const struct submodule *submodule_from_path(struct repository *r, const struct object_id *commit_or_tree, const char *path); -extern const struct submodule *submodule_from_cache(struct repository *repo, - const struct object_id *treeish_name, - const char *key); void submodule_free(struct repository *r); #endif /* SUBMODULE_CONFIG_H */ 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) { |