[PATCH v3 2/4] apply: do not read from the filesystem under --index
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 4, 2015, 00:44 UTC
- Message-ID
- <1423010662-26497-3-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1423010662-26497-1-git-send-email-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> ---
* Same as v2
builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/apply.c b/builtin/apply.c index c751ddf..05eaf54 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3136,7 +3136,7 @@ static int load_patch_target(struct strbuf *buf, const char *name, unsigned expected_mode) { - if (cached) { + if (cached || check_index) { if (read_file_or_gitlink(ce, buf)) return error(_("read of %s failed"), name); } else if (name) {
-- 2.3.0-rc2-168-g106c876