diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:01 (GMT) |
| commit | 5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5 (patch) | |
| tree | a0eaaf3110e43b2a4aec5f7023fbf62a655418de /submodule.h | |
| parent | 1016495a7190911b37c354f7a985278c51ae6666 (diff) | |
| parent | f9ee2fcdfa05586b6a4476c7aa5f4f0162e48455 (diff) | |
| download | git-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.zip git-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.tar.gz git-5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5.tar.bz2 | |
Merge branch 'bw/grep-recurse-submodules'
"git grep --recurse-submodules" has been reworked to give a more
consistent output across submodule boundary (and do its thing
without having to fork a separate process).
* bw/grep-recurse-submodules:
grep: recurse in-process using 'struct repository'
submodule: merge repo_read_gitmodules and gitmodules_config
submodule: check for unmerged .gitmodules outside of config parsing
submodule: check for unstaged .gitmodules outside of config parsing
submodule: remove fetch.recursesubmodules from submodule-config parsing
submodule: remove submodule.fetchjobs from submodule-config parsing
config: add config_from_gitmodules
cache.h: add GITMODULES_FILE macro
repository: have the_repository use the_index
repo_read_index: don't discard the index
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule.h b/submodule.h index f1aa3ff..e402b00 100644 --- a/submodule.h +++ b/submodule.h @@ -33,7 +33,8 @@ struct submodule_update_strategy { }; #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} -extern int is_staging_gitmodules_ok(void); +extern int is_gitmodules_unmerged(const struct index_state *istate); +extern int is_staging_gitmodules_ok(const 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); @@ -76,7 +77,6 @@ extern void show_submodule_inline_diff(FILE *f, const char *path, unsigned dirty_submodule, const char *meta, const char *del, const char *add, const char *reset, const struct diff_options *opt); -extern void set_config_fetch_recurse_submodules(int value); /* Check if we want to update any submodule.*/ extern int should_update_submodules(void); /* @@ -87,6 +87,7 @@ 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 unsigned is_submodule_modified(const char *path, int ignore_untracked); extern int submodule_uses_gitfile(const char *path); @@ -112,7 +113,6 @@ extern int push_unpushed_submodules(struct oid_array *commits, const struct string_list *push_options, int dry_run); extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); -extern int parallel_submodules(void); /* * Given a submodule path (as in the index), return the repository * path of that submodule in 'buf'. Return -1 on error or when the |