diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 22:31:10 +0100 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 16:30:49 +0100 |
| commit | d851d94151734db8234b0a3dba7783bce36dd00b (patch) | |
| tree | 667452c16966204ffdc71623e5b4334fd539c3d1 /tree-walk.c | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
| parent | caccc527ca7f4b3e6f4bb6775cbff94b27741482 (diff) | |
| download | git-d851d94151734db8234b0a3dba7783bce36dd00b.tar.gz | |
Sync with 2.19.3
* maint-2.19: (34 commits)
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
protect_ntfs: turn on NTFS protection by default
path: also guard `.gitmodules` against NTFS Alternate Data Streams
...
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 79bafbd1a2..bf07946ec4 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 */ |