diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 14:37:22 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 14:37:22 +0100 |
commit | abb4824d13a44f68d1bbaf6726945983230771f9 (patch) | |
tree | 316449048983aa8a4503af46cd450199a69b1078 /submodule.h | |
parent | Merge branch 'nb/worktree-api-doc' (diff) | |
parent | t/helper: add test-submodule-nested-repo-config (diff) | |
download | git-abb4824d13a44f68d1bbaf6726945983230771f9.tar.xz git-abb4824d13a44f68d1bbaf6726945983230771f9.zip |
Merge branch 'ao/submodule-wo-gitmodules-checked-out'
The submodule support has been updated to read from the blob at
HEAD:.gitmodules when the .gitmodules file is missing from the
working tree.
* ao/submodule-wo-gitmodules-checked-out:
t/helper: add test-submodule-nested-repo-config
submodule: support reading .gitmodules when it's not in the working tree
submodule: add a helper to check if it is safe to write to .gitmodules
t7506: clean up .gitmodules properly before setting up new scenario
submodule: use the 'submodule--helper config' command
submodule--helper: add a new 'config' subcommand
t7411: be nicer to future tests and really clean things up
t7411: merge tests 5 and 6
submodule: factor out a config_set_in_gitmodules_file_gently function
submodule: add a print_config_from_gitmodules() helper
Diffstat (limited to 'submodule.h')
-rw-r--r-- | submodule.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index a8a4fe8d25..a680214c01 100644 --- a/submodule.h +++ b/submodule.h @@ -40,6 +40,7 @@ struct submodule_update_strategy { #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} int is_gitmodules_unmerged(const struct index_state *istate); +int is_writing_gitmodules_ok(void); int is_staging_gitmodules_ok(struct index_state *istate); int update_path_in_gitmodules(const char *oldpath, const char *newpath); int remove_path_from_gitmodules(const char *path); |