Sync with 2.16.6

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index b9b7ef0030a732bb81745641413f9f013588c91d..51b9cf245a25f67c2d1ac2301d6727d8be175db9 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -113,11 +113,16 @@ extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git
  */
 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,
                               const char *old,
-                              const char *new,
+                              const char *new_head,
                               unsigned flags);
 
 /*