kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

apply: do not read from the filesystem under --index 

We currently read the preimage to apply a patch from the index only
when the --cached option is given.  Do so also when the command is
running under the --index option.  With --index, the index entry and
the working tree file for a path that is involved in a patch must be
identical, so this should not affect the result, but by reading from
the index, we will get the protection to avoid reading an unintended
path beyond a symbolic link automatically.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2015-01-30 15:15:59 -08:00
parent c536c0755f
commit 3c37a2e339
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/apply.c
View File

@ -3136,7 +3136,7 @@ static int load_patch_target(struct strbuf *buf,
const char *name, const char *name,
unsigned expected_mode) unsigned expected_mode)
{ {
if (cached) { if (cached || check_index) {
if (read_file_or_gitlink(ce, buf)) if (read_file_or_gitlink(ce, buf))
return error(_("read of %s failed"), name); return error(_("read of %s failed"), name);
} else if (name) { } else if (name) {