diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:28 -0800 |
| commit | 00c4d2b6bca954b4505221616dd3f53230f9b299 (patch) | |
| tree | 4fa20727a7f4f1c2db4c9638567ebce9a1eda6cf /submodule.h | |
| parent | Merge branch 'es/clone-shared-worktree' (diff) | |
| parent | submodule: convert get_next_submodule to not rely on the_index (diff) | |
| download | tgif-00c4d2b6bca954b4505221616dd3f53230f9b299.tar.xz | |
Merge branch 'bw/submodule-sans-cache-compat'
Code clean-up.
* bw/submodule-sans-cache-compat:
submodule: convert get_next_submodule to not rely on the_index
submodule: used correct index in is_staging_gitmodules_ok
submodule: convert stage_updated_gitmodules to take a struct index_state
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/submodule.h b/submodule.h index f0da0277a4..b9b7ef0030 100644 --- a/submodule.h +++ b/submodule.h @@ -34,10 +34,10 @@ struct submodule_update_strategy { #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} extern int is_gitmodules_unmerged(const struct index_state *istate); -extern int is_staging_gitmodules_ok(const struct index_state *istate); +extern int is_staging_gitmodules_ok(struct index_state *istate); extern int update_path_in_gitmodules(const char *oldpath, const char *newpath); extern int remove_path_from_gitmodules(const char *path); -extern void stage_updated_gitmodules(void); +extern void stage_updated_gitmodules(struct index_state *istate); extern void set_diffopt_flags_from_submodule_config(struct diff_options *, const char *path); extern int git_default_submodule_config(const char *var, const char *value, void *cb); @@ -76,10 +76,12 @@ extern int should_update_submodules(void); */ extern const struct submodule *submodule_from_ce(const struct cache_entry *ce); extern void check_for_new_submodule_commits(struct object_id *oid); -extern int fetch_populated_submodules(const struct argv_array *options, - const char *prefix, int command_line_option, - int default_option, - int quiet, int max_parallel_jobs); +extern int fetch_populated_submodules(struct repository *r, + const struct argv_array *options, + const char *prefix, + int command_line_option, + int default_option, + int quiet, int max_parallel_jobs); extern unsigned is_submodule_modified(const char *path, int ignore_untracked); extern int submodule_uses_gitfile(const char *path); |