diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:59:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:59:20 -0800 |
| commit | 2ac4b4b2228f3ef996db7b07aea74c4b1a796f38 (patch) | |
| tree | 245c7610f3a42fef9d63a883a281dc8e3efffe8a /builtin-blame.c | |
| parent | 990732609ce735c482e571ad95767edf1d693b41 (diff) | |
| parent | 21e5ad50fc5e7277c74cfbb3cf6502468e840f86 (diff) | |
| download | git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.gz | |
Merge branch 'sp/safecrlf'
* sp/safecrlf:
safecrlf: Add mechanism to warn about irreversible crlf conversions
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index c7e68874e7..1cf254dcca 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2073,7 +2073,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con if (strbuf_read(&buf, 0, 0) < 0) die("read error %s from stdin", strerror(errno)); } - convert_to_git(path, buf.buf, buf.len, &buf); + convert_to_git(path, buf.buf, buf.len, &buf, 0); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1); |