Sync with 2.17.3

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 7856b8a0b3d676cde20095f69a4d000d8cf38615..17347ace2edf6ea7ac87692da58f1f451c9bdffa 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -114,6 +114,11 @@ extern int push_unpushed_submodules(struct oid_array *commits,
  */
 int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
 
+/*
+ * Make sure that no submodule's git dir is nested in a sibling submodule's.
+ */
+int validate_submodule_git_dir(char *git_dir, const char *submodule_name);
+
 #define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0)
 #define SUBMODULE_MOVE_HEAD_FORCE   (1<<1)
 extern int submodule_move_head(const char *path,