summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-22 05:18:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-22 05:18:06 (GMT)
commit023020401d21c8c48d7f0a123c7ff50888e101c7 (patch)
tree1529374ef1c5c8ca26804d1e212f0dfc75789e1d /apply.c
parentd32eb83c1db7d0a8bb54fe743c6d1dd674d372c5 (diff)
parentd33c87517a85f544159b2efa406136dde18a5b9f (diff)
downloadgit-023020401d21c8c48d7f0a123c7ff50888e101c7.zip
git-023020401d21c8c48d7f0a123c7ff50888e101c7.tar.gz
git-023020401d21c8c48d7f0a123c7ff50888e101c7.tar.bz2
Sync with Git 2.15.2
* maint-2.15: 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 321a9fa..5a147ce 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;
}