projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.13.7
[platform/upstream/git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
f8bf0bd
..
b96d375
100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-3867,9
+3867,9
@@
static int check_unsafe_path(struct patch *patch)
if (!patch->is_delete)
new_name = patch->new_name;
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);
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;
}
return error(_("invalid path '%s'"), new_name);
return 0;
}