diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 21:46:37 (GMT) |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 15:31:12 (GMT) |
| commit | fc346cb2925d4647ccd65177660bffab13cbe253 (patch) | |
| tree | 414c061e84002c2f65ef9b3d50646128217dcac4 /submodule.h | |
| parent | 8104ec994ea3849a968b4667d072fedd1e688642 (diff) | |
| parent | 4cd1cf31efed9b16db5035c377bfa222f5272458 (diff) | |
| download | git-fc346cb2925d4647ccd65177660bffab13cbe253.zip git-fc346cb2925d4647ccd65177660bffab13cbe253.tar.gz git-fc346cb2925d4647ccd65177660bffab13cbe253.tar.bz2 | |
Sync with 2.20.2
* maint-2.20: (36 commits)
Git 2.20.2
t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
Git 2.19.3
Git 2.18.2
Git 2.17.3
Git 2.16.6
test-drop-caches: use `has_dos_drive_prefix()`
Git 2.15.4
Git 2.14.6
mingw: handle `subst`-ed "DOS drives"
mingw: refuse to access paths with trailing spaces or periods
mingw: refuse to access paths with illegal characters
unpack-trees: let merged_entry() pass through do_add_entry()'s errors
quote-stress-test: offer to test quoting arguments for MSYS2 sh
t6130/t9350: prepare for stringent Win32 path validation
quote-stress-test: allow skipping some trials
quote-stress-test: accept arguments to test via the command-line
tests: add a helper to stress test argument quoting
mingw: fix quoting of arguments
Disallow dubiously-nested submodule git directories
...
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 9e18e9b..4fd2db5 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, |