mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/safecrlf'

Browse Source 
* sp/safecrlf:
  safecrlf: Add mechanism to warn about irreversible crlf conversions
This commit is contained in:
Junio C Hamano
2008-02-16 17:59:20 -08:00
parent 990732609c 21e5ad50fc
commit 2ac4b4b222
11 changed files with 189 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-blame.c
View File

@ -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);