summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-22 05:25:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-22 05:25:26 (GMT)
commit68f95b26e43f8183b9d1cdd41f42e99da43152bf (patch)
tree4f4b323fe659afdcce0f105b3dbfc0eafd0965a3 /apply.c
parent468165c1d8a442994a825f3684528361727cd8c0 (diff)
parenta42a58d7b62cc1d6301440e81a83feed9d7c118c (diff)
downloadgit-68f95b26e43f8183b9d1cdd41f42e99da43152bf.zip
git-68f95b26e43f8183b9d1cdd41f42e99da43152bf.tar.gz
git-68f95b26e43f8183b9d1cdd41f42e99da43152bf.tar.bz2
Sync with Git 2.16.4
* maint-2.16: Git 2.16.4 Git 2.15.2 Git 2.14.4 Git 2.13.7 verify_path: disallow symlinks in .gitmodules update-index: stat updated files earlier verify_dotfile: mention case-insensitivity in comment verify_path: drop clever fallthrough skip_prefix: add case-insensitive variant is_{hfs,ntfs}_dotgitmodules: add tests is_ntfs_dotgit: match other .git files is_hfs_dotgit: match other .git files is_ntfs_dotgit: use a size_t for traversing string submodule-config: verify submodule names as paths
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index 134dc7b..2d1cfe4 100644
--- a/apply.c
+++ b/apply.c
@@ -3860,9 +3860,9 @@ static int check_unsafe_path(struct patch *patch)
if (!patch->is_delete)
new_name = patch->new_name;
- if (old_name && !verify_path(old_name))
+ if (old_name && !verify_path(old_name, patch->old_mode))
return error(_("invalid path '%s'"), old_name);
- if (new_name && !verify_path(new_name))
+ if (new_name && !verify_path(new_name, patch->new_mode))
return error(_("invalid path '%s'"), new_name);
return 0;
}