diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:48:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:50:44 -0700 |
| commit | 49d3536594e653717844d53825fa7c0a494888f7 (patch) | |
| tree | 35022ab151934461b2a9f21cce140b5a773369c6 /combine-diff.c | |
| parent | 98fcf840af443a0a93b9a6cd1fada5af826383f3 (diff) | |
| parent | 5760a6b094736e6f59eb32c7abb4cdbb7fca1627 (diff) | |
| download | git-49d3536594e653717844d53825fa7c0a494888f7.tar.gz | |
Merge branch 'maint' to sync with 1.6.0.1
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 31ec0c5165..0cf2a830b5 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -723,6 +723,18 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, die("early EOF '%s'", elem->path); result[len] = 0; + + /* If not a fake symlink, apply filters, e.g. autocrlf */ + if (is_file) { + struct strbuf buf; + + strbuf_init(&buf, 0); + if (convert_to_git(elem->path, result, len, &buf, safe_crlf)) { + free(result); + result = strbuf_detach(&buf, &len); + result_size = len; + } + } } else { deleted_file: |