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

Merge branch 'tb/crlf-conv-flags'

Browse Source 
Code clean-up.

* tb/crlf-conv-flags:
  convert_to_git(): safe_crlf/checksafe becomes int conv_flags
This commit is contained in:
Junio C Hamano
2018-02-13 13:39:08 -08:00
parent 8fe806bcd5 8462ff43e4
commit 9bc89b17e3
8 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
combine-diff.c
View File

@ -1053,7 +1053,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (is_file) {
struct strbuf buf = STRBUF_INIT;
if (convert_to_git(&the_index, elem->path, result, len, &buf, safe_crlf)) {
if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) {
free(result);
result = strbuf_detach(&buf, &len);
result_size = len;