diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:59:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:59:20 (GMT) |
| commit | 2ac4b4b2228f3ef996db7b07aea74c4b1a796f38 (patch) | |
| tree | 245c7610f3a42fef9d63a883a281dc8e3efffe8a /builtin-apply.c | |
| parent | 990732609ce735c482e571ad95767edf1d693b41 (diff) | |
| parent | 21e5ad50fc5e7277c74cfbb3cf6502468e840f86 (diff) | |
| download | git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.zip git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.gz git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.bz2 | |
Merge branch 'sp/safecrlf'
* sp/safecrlf:
safecrlf: Add mechanism to warn about irreversible crlf conversions
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 46dad5b..6a88ff0 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1430,7 +1430,7 @@ 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); + convert_to_git(path, buf->buf, buf->len, buf, 0); return 0; default: return -1; |