With the previous fixes to CRLF handling in place, read_old_data()
knows what it wants convert_to_git() to do with respect to CRLF. In
fact, this codepath is about applying a patch to a file in the
filesystem, which may not exist in the index, or may exist but may
not match what is recorded in the index, or in the extreme case, we
may not even be in a Git repository. If convert_to_git() peeked at
the index while doing its work, it *would* be a bug.
Pass NULL instead of &the_index to the function to make sure we
catch future bugs to clarify this.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* NOTE NOTE NOTE: This is not a part of the "squashed diff" I sent
earlier, and with this applied, you will see failure in t0020.
The breakage is because convert_to_git(), with your [PATCH 1/2],
is not yet prepared to be told "there is no need for safe-crlf
processing, so do not even look at the index". You either need
to invent yet another flag similar to SAFE_CRLF_KEEP_CRLF that is
different from SAFE_CRLF_FALSE to tell the machinery never to
look at the index, or fix SAFE_CRLF_FALSE itself so that the
index is not checked when the caller knows safe-crlf processing
is not needed.
apply.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/apply.c b/apply.c
index c06f7014a2..ad58cd1c77 100644
--- a/apply.c
+++ b/apply.c
@@ -2301,7 +2301,15 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf,
case S_IFREG:
if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
return error(_("unable to open or read %s"), path);
- convert_to_git(&the_index, path, buf->buf, buf->len, buf, safe_crlf);
+ /*
+ * "git apply" without "--index/--cached" should never look
+ * at the index; the target file may not have been added to
+ * the index yet, and we may not even be in any Git repository.
+ * Pass NULL to convert_to_git() to stress this; the function
+ * should never look at the index when explicit crlf option
+ * is given.
+ */
+ convert_to_git(NULL, path, buf->buf, buf->len, buf, safe_crlf);
return 0;
default:
return -1;
--
2.14.1-331-g7631d96230
