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
This commit is contained in:
4
apply.c
4
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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user