diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 21:21:20 (GMT) |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 15:29:15 (GMT) |
| commit | 14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2 (patch) | |
| tree | d8127060ce208c40c4f5dd67a412171154e362c6 /submodule.h | |
| parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
| parent | a5ab8d03173458b76b8452efd90a7173f490c132 (diff) | |
| download | git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.zip git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.tar.gz git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.tar.bz2 | |
Sync with 2.17.3
* maint-2.17: (32 commits)
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
protect_ntfs: turn on NTFS protection by default
path: also guard `.gitmodules` against NTFS Alternate Data Streams
is_ntfs_dotgit(): speed it up
mingw: disallow backslash characters in tree objects' file names
...
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 7856b8a..17347ac 100644 --- 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, |