diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 3 | ||||
| -rw-r--r-- | builtin/blame.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 42c610e2ec..f33d9cf20b 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2142,7 +2142,8 @@ 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(path, buf->buf, buf->len, buf, 0); + convert_to_git(path, buf->buf, buf->len, buf, + SAFE_CRLF_FALSE, NULL); return 0; default: return -1; diff --git a/builtin/blame.c b/builtin/blame.c index e982fb8137..6305a1edd8 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2376,7 +2376,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); } - convert_to_git(path, buf.buf, buf.len, &buf, 0); + convert_to_git(path, buf.buf, buf.len, &buf, SAFE_CRLF_FALSE, NULL); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1); |