averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

submodule-config: remove submodule_from_cache

Browse Source 
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>
This commit is contained in:
Stefan Beller
2018-03-28 15:35:30 -07:00
committed by Junio C Hamano
parent 3b8fb393bc
commit 0c89fdd739
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repository.c
View File

@@ -176,7 +176,7 @@ int repo_submodule_init(struct repository *submodule,
struct strbuf worktree = STRBUF_INIT; struct strbuf worktree = STRBUF_INIT;
int ret = 0; int ret = 0;
sub = submodule_from_cache(superproject, &null_oid, path); sub = submodule_from_path(superproject, &null_oid, path);
if (!sub) { if (!sub) {
ret = -1; ret = -1;
goto out; goto out;

9
submodule-config.c
View File

@@ -635,15 +635,6 @@ const struct submodule *submodule_from_path(struct repository *r,
return config_from(r->submodule_cache, treeish_name, path, lookup_path); 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) void submodule_free(struct repository *r)
{ {
if (r->submodule_cache) if (r->submodule_cache)

3
submodule-config.h
View File

@@ -45,9 +45,6 @@ const struct submodule *submodule_from_name(struct repository *r,
const struct submodule *submodule_from_path(struct repository *r, const struct submodule *submodule_from_path(struct repository *r,
const struct object_id *commit_or_tree, const struct object_id *commit_or_tree,
const char *path); 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); void submodule_free(struct repository *r);
#endif /* SUBMODULE_CONFIG_H */ #endif /* SUBMODULE_CONFIG_H */

4
submodule.c
View File

@@ -231,7 +231,7 @@ int is_submodule_active(struct repository *repo, const char *path)
const struct string_list *sl; const struct string_list *sl;
const struct submodule *module; 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 */ /* early return if there isn't a path->module mapping */
if (!module) if (!module)
@@ -1236,7 +1236,7 @@ static int get_next_submodule(struct child_process *cp,
if (!S_ISGITLINK(ce->ce_mode)) if (!S_ISGITLINK(ce->ce_mode))
continue; continue;
submodule = submodule_from_cache(spf->r, &null_oid, ce->name); submodule = submodule_from_path(spf->r, &null_oid, ce->name);
if (!submodule) { if (!submodule) {
const char *name = default_name_or_path(ce->name); const char *name = default_name_or_path(ce->name);
if (name) { if (name) {