Merge branch 'ds/push-squelch-ambig-warning'

diff --git a/submodule.h b/submodule.h
index a8a4fe8d2565a543f6a817eb31d76d5b6804ae40..a680214c01a5fda90a21af547389f6333388683c 100644 (file)
--- 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);