diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-05 00:46:37 +0300 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 18:31:12 +0300 |
| commit | fc346cb2925d4647ccd65177660bffab13cbe253 (patch) | |
| tree | 414c061e84002c2f65ef9b3d50646128217dcac4 /tree-walk.c | |
| parent | 8104ec994ea3849a968b4667d072fedd1e688642 (diff) | |
| parent | 4cd1cf31efed9b16db5035c377bfa222f5272458 (diff) | |
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 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c index 1e4bbc8a0e..bf6f23397a 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -43,6 +43,12 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l strbuf_addstr(err, _("empty filename in tree entry")); return -1; } +#ifdef GIT_WINDOWS_NATIVE + if (protect_ntfs && strchr(path, '\\')) { + strbuf_addf(err, _("filename in tree entry contains backslash: '%s'"), path); + return -1; + } +#endif len = strlen(path) + 1; /* Initialize the descriptor entry */ |