diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-22 05:15:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 05:15:14 (GMT) |
| commit | 9e0f06d55df5855178ff41342937943604f6e97c (patch) | |
| tree | 496489bd5c449b78420c301d2b00c82b42fe7031 /apply.c | |
| parent | 3013dff8662eae06457fe6e5348dfe2270810ab2 (diff) | |
| parent | 4dde7b8799dec0e7aecb04fdc55c656e674cff6f (diff) | |
| download | git-9e0f06d55df5855178ff41342937943604f6e97c.zip git-9e0f06d55df5855178ff41342937943604f6e97c.tar.gz git-9e0f06d55df5855178ff41342937943604f6e97c.tar.bz2 | |
Sync with Git 2.14.4
* maint-2.14:
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3865,9 +3865,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; } |