Skip to content

Commit

Permalink
submodule-config: remove submodule_from_cache
Browse files Browse the repository at this point in the history
This continues the story of bf12fcd (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>
  • Loading branch information
stefanbeller authored and gitster committed Mar 29, 2018
1 parent 3b8fb39 commit 0c89fdd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion repository.c
Expand Up @@ -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;
Expand Down
9 changes: 0 additions & 9 deletions submodule-config.c
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions submodule-config.h
Expand Up @@ -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 */
4 changes: 2 additions & 2 deletions submodule.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 0c89fdd

Please sign in to comment.