diff options
| author | Brandon Williams <bmwill@google.com> | 2017-08-02 12:49:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-02 14:26:46 -0700 |
| commit | 91b834807b98b620050fe534b6de93e223dbcbcf (patch) | |
| tree | 6fe6b91d477bae8b1ccbba44eb1b29661bd9efc5 /submodule.h | |
| parent | 8fa2915971e5032e6a32f5096452db81ab8795eb (diff) | |
| download | git-91b834807b98b620050fe534b6de93e223dbcbcf.tar.gz | |
submodule: check for unstaged .gitmodules outside of config parsing
Teach 'is_staging_gitmodules_ok()' to be able to determine in the
'.gitmodules' file has unstaged changes based on the passed in index
instead of relying on a global variable which is set during the
submodule-config parsing.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 29a1ecd19a..b14660585f 100644 --- a/submodule.h +++ b/submodule.h @@ -33,7 +33,7 @@ struct submodule_update_strategy { }; #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} -extern int is_staging_gitmodules_ok(void); +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); |