summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-16 17:59:20 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-16 17:59:20 -0800
commit2ac4b4b2228f3ef996db7b07aea74c4b1a796f38 (patch)
tree245c7610f3a42fef9d63a883a281dc8e3efffe8a /diff.c
parent990732609ce735c482e571ad95767edf1d693b41 (diff)
parent21e5ad50fc5e7277c74cfbb3cf6502468e840f86 (diff)
downloadgit-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.gz
Merge branch 'sp/safecrlf'
* sp/safecrlf: safecrlf: Add mechanism to warn about irreversible crlf conversions
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 41ec2ced78..58fe7750f9 100644
--- a/diff.c
+++ b/diff.c
@@ -1631,7 +1631,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
* Convert from working tree format to canonical git format
*/
strbuf_init(&buf, 0);
- if (convert_to_git(s->path, s->data, s->size, &buf)) {
+ if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
size_t size = 0;
munmap(s->data, s->size);
s->should_munmap = 0;