diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-22 05:10:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 05:10:49 (GMT) |
| commit | 7b01c71b64d25202d80b73cbd46104ebfddbdab3 (patch) | |
| tree | 98de7ee189397c8e539459ed1a699be47cc0bff3 /apply.c | |
| parent | fc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff) | |
| parent | 0114f71344844be9e5add321cffea34bac077d75 (diff) | |
| download | git-7b01c71b64d25202d80b73cbd46104ebfddbdab3.zip git-7b01c71b64d25202d80b73cbd46104ebfddbdab3.tar.gz git-7b01c71b64d25202d80b73cbd46104ebfddbdab3.tar.bz2 | |
Sync with Git 2.13.7
* maint-2.13:
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
@@ -3882,9 +3882,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; } |