Sync with maint

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 8072e6d6ddfd847ca8f739e9d8af9b815c43e21d..c81ec1a9b6c8ff3061c8119ad68b32f850314d9b 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -124,6 +124,11 @@ int push_unpushed_submodules(struct repository *r,
  */
 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)
 int submodule_move_head(const char *path,