diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
| commit | 9bc89b17e36db31a54bc3ff16e48b5cb6beb095b (patch) | |
| tree | 160acf5d402bc4a638fbaa5ad7d16dc228e08f88 /combine-diff.c | |
| parent | 8fe806bcd5ac621e22982c73306e94d26e56cf79 (diff) | |
| parent | 8462ff43e42ab67cecd16fdfb59451a53cc8a945 (diff) | |
| download | git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.zip git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.gz git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.bz2 | |
Merge branch 'tb/crlf-conv-flags'
Code clean-up.
* tb/crlf-conv-flags:
convert_to_git(): safe_crlf/checksafe becomes int conv_flags
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index bc08c4c..18c74da 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -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; |