| commit | 3c37a2e339e695c7cc41048fe0921cbc8b48b0f0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Jan 2015 23:15:59 +0000 (30 15:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Feb 2015 21:41:16 +0000 (10 13:41 -0800) | ||
| tree | e370f3cbb02d451a548f13a51db37da80a695e31 | treesnapshot (tar.gz zip) |
| parent | c536c0755f6450b7bcce499cfda171f8c6d1e593 | commitdiff |
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>
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>
| builtin/apply.c | diffblobblamehistory |