aboutsummaryrefslogtreecommitdiffstats
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-09 22:17:55 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-09 22:17:55 -0800
commit7034cd094bda4edbcdff7fad1a28fcaaf9b9a040 (patch)
treee0b837c5e5a2ea2fce3255ef59fd981e2bd30374 /submodule.h
parent559c6fc317f92a0a3994f816d3513cd322745852 (diff)
parent53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff)
downloadgit-7034cd094bda4edbcdff7fad1a28fcaaf9b9a040.tar.gz
Sync with Git 2.24.1
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h
index 8072e6d6dd..c81ec1a9b6 100644
--- 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,