summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 21:27:04 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:30:38 (GMT)
commit7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab (patch)
treeae220474a41e8a55e2d4a2f98e297e117a1f6e16 /tree-walk.c
parent98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff)
parent9877106b01cbd346b862cc8cd2c52e496dd40ed5 (diff)
downloadgit-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.zip
git-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.tar.gz
git-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.tar.bz2
Sync with 2.18.2
* maint-2.18: (33 commits) 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 is_ntfs_dotgit(): speed it up ...
Diffstat (limited to 'tree-walk.c')
-rw-r--r--tree-walk.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 77b37f3..9b96b7e 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 */