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>
Junio C Hamano committed
Jan 30, 2015 at 15:15 UTC
3c37a2e339e695c7cc41048fe0921cbc8b48b0f0
1 file changed
+1
-1
builtin/apply.c
+1
-1
@@ -3136,7 +3136,7 @@ static int load_patch_target(struct strbuf *buf,
3136
const char *name,
3137
unsigned expected_mode)
3138
{
3139
- if (cached) {
3139
+ if (cached || check_index) {
3140
if (read_file_or_gitlink(ce, buf))
3141
return error(_("read of %s failed"), name);
3142
} else if (name) {