diff options
| author | Brandon Williams <bmwill@google.com> | 2017-12-12 19:53:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-12 20:35:21 (GMT) |
| commit | 7da9aba417868afa11ef0baa4078dc2dadde5333 (patch) | |
| tree | 527b9b12cb223db899b800c32edaf9edced27898 /submodule.h | |
| parent | 3b8317a9e6f1538c99074eeffd4b27ac18de5648 (diff) | |
| download | git-7da9aba417868afa11ef0baa4078dc2dadde5333.zip git-7da9aba417868afa11ef0baa4078dc2dadde5333.tar.gz git-7da9aba417868afa11ef0baa4078dc2dadde5333.tar.bz2 | |
submodule: used correct index in is_staging_gitmodules_ok
Commit 883e248b8 (fsmonitor: teach git to optionally utilize a file
system monitor to speed up detecting new or changed files., 2017-09-22)
introduced a call to 'ce_match_stat()' in 'is_staging_gitmodules_ok()'
which implicitly relys on the the global 'the_index' instead of the
passed in 'struct index_state'. Fix this by changing the call to
'ie_match_stat()' and using the passed in index_state struct.
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 cd984ec..e2a5de3 100644 --- a/submodule.h +++ b/submodule.h @@ -34,7 +34,7 @@ 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(struct index_state *istate); |