diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-05 13:32:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-05 13:32:56 -0700 |
| commit | 85ce4a6828a418a22c69a870b3e059481b4263d6 (patch) | |
| tree | 6775adbc2f52165f56cd758820c78f201f349ef3 /submodule.h | |
| parent | 5116f791c12dda6b6c22fa85b600a8e30dfa168a (diff) | |
| parent | 188dce131fa95d85ddc024a1bc7d2b7fc5da4424 (diff) | |
| download | git-85ce4a6828a418a22c69a870b3e059481b4263d6.tar.gz | |
Merge branch 'bw/repo-object'
Introduce a "repository" object to eventually make it easier to
work in multiple repositories (the primary focus is to work with
the superproject and its submodules) in a single process.
* bw/repo-object:
ls-files: use repository object
repository: enable initialization of submodules
submodule: convert is_submodule_initialized to work on a repository
submodule: add repo_read_gitmodules
submodule-config: store the_submodule_cache in the_repository
repository: add index_state to struct repo
config: read config from a repository object
path: add repo_worktree_path and strbuf_repo_worktree_path
path: add repo_git_path and strbuf_repo_git_path
path: worktree_git_path() should not use file relocation
path: convert do_git_path to take a 'struct repository'
path: convert strbuf_git_common_path to take a 'struct repository'
path: always pass in commondir to update_common_dir
path: create path.h
environment: store worktree in the_repository
environment: place key repository state in the_repository
repository: introduce the repository object
environment: remove namespace_len variable
setup: add comment indicating a hack
setup: don't perform lazy initialization of repository state
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index cbe5c1726f..623ce6ad77 100644 --- a/submodule.h +++ b/submodule.h @@ -1,6 +1,7 @@ #ifndef SUBMODULE_H #define SUBMODULE_H +struct repository; struct diff_options; struct argv_array; struct oid_array; @@ -46,8 +47,9 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt, const char *arg, int unset); void load_submodule_cache(void); extern void gitmodules_config(void); +extern void repo_read_gitmodules(struct repository *repo); extern void gitmodules_config_sha1(const unsigned char *commit_sha1); -extern int is_submodule_initialized(const char *path); +extern int is_submodule_active(struct repository *repo, const char *path); /* * Determine if a submodule has been populated at a given 'path' by checking if * the <path>/.git resolves to a valid git repository. |