diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-22 13:48:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 13:48:26 +0900 |
| commit | 8528c31d98c358cd27f45e203745bcdef03ca589 (patch) | |
| tree | 47fd3ecfa1590f62eaa65dced6aef152a85b33e6 /apply.c | |
| parent | 42e6fde5c28150206956ea4be490d886c4ecbd68 (diff) | |
| parent | 10ecfa76491e4923988337b2e2243b05376b40de (diff) | |
| download | git-8528c31d98c358cd27f45e203745bcdef03ca589.tar.gz | |
Merge branch 'jk/submodule-fix-loose' into maint-2.13
* jk/submodule-fix-loose:
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
@@ -3867,9 +3867,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; } |