From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/submodule-config.h | 40 ++------------------------------------ 1 file changed, 2 insertions(+), 38 deletions(-) (limited to 'third_party/git/submodule-config.h') diff --git a/third_party/git/submodule-config.h b/third_party/git/submodule-config.h index c11e22cf50..1b4e2da658 100644 --- a/third_party/git/submodule-config.h +++ b/third_party/git/submodule-config.h @@ -7,31 +7,9 @@ #include "submodule.h" #include "strbuf.h" -/** - * The submodule config cache API allows to read submodule - * configurations/information from specified revisions. Internally - * information is lazily read into a cache that is used to avoid - * unnecessary parsing of the same .gitmodules files. Lookups can be done by - * submodule path or name. - * - * Usage - * ----- - * - * The caller can look up information about submodules by using the - * `submodule_from_path()` or `submodule_from_name()` functions. They return - * a `struct submodule` which contains the values. The API automatically - * initializes and allocates the needed infrastructure on-demand. If the - * caller does only want to lookup values from revisions the initialization - * can be skipped. - * - * If the internal cache might grow too big or when the caller is done with - * the API, all internally cached values can be freed with submodule_free(). - * - */ - /* * Submodule entry containing the information about a certain submodule - * in a certain revision. It is returned by the lookup functions. + * in a certain revision. */ struct submodule { const char *path; @@ -61,29 +39,15 @@ int option_fetch_parse_recurse_submodules(const struct option *opt, const char *arg, int unset); int parse_update_recurse_submodules_arg(const char *opt, const char *arg); int parse_push_recurse_submodules_arg(const char *opt, const char *arg); -void repo_read_gitmodules(struct repository *repo, int skip_if_read); +void repo_read_gitmodules(struct repository *repo); void gitmodules_config_oid(const struct object_id *commit_oid); - -/** - * Same as submodule_from_path but lookup by name. - */ const struct submodule *submodule_from_name(struct repository *r, const struct object_id *commit_or_tree, const char *name); - -/** - * Given a tree-ish in the superproject and a path, return the submodule that - * is bound at the path in the named tree. - */ const struct submodule *submodule_from_path(struct repository *r, const struct object_id *commit_or_tree, const char *path); - -/** - * Use these to free the internally cached values. - */ void submodule_free(struct repository *r); - int print_config_from_gitmodules(struct repository *repo, const char *key); int config_set_in_gitmodules_file_gently(const char *key, const char *value); -- cgit 1.4.1