diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 20:38:25 (GMT) |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 15:27:18 (GMT) |
| commit | 9ac92fed5b63176e653c3c42e2b66cdd203c906f (patch) | |
| tree | a1733918e274272dc9aecb371717c52a071254c0 /submodule.h | |
| parent | 27d05d1a1a62273aa3749f4d0ab8a126ef11ff66 (diff) | |
| parent | 7cdafcaacf677b9e0700fa988c247bda192db48d (diff) | |
| download | git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.zip git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.tar.gz git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.tar.bz2 | |
Sync with 2.15.4
* maint-2.15: (29 commits)
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
path: safeguard `.git` against NTFS Alternate Streams Accesses
clone --recurse-submodules: prevent name squatting on Windows
is_ntfs_dotgit(): only verify the leading segment
...
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 b9b7ef0..4461b71 100644 --- a/submodule.h +++ b/submodule.h @@ -113,6 +113,11 @@ 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, |