summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-24 21:48:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-24 21:50:44 (GMT)
commit49d3536594e653717844d53825fa7c0a494888f7 (patch)
tree35022ab151934461b2a9f21cce140b5a773369c6 /combine-diff.c
parent98fcf840af443a0a93b9a6cd1fada5af826383f3 (diff)
parent5760a6b094736e6f59eb32c7abb4cdbb7fca1627 (diff)
downloadgit-49d3536594e653717844d53825fa7c0a494888f7.zip
git-49d3536594e653717844d53825fa7c0a494888f7.tar.gz
git-49d3536594e653717844d53825fa7c0a494888f7.tar.bz2
Merge branch 'maint' to sync with 1.6.0.1
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 31ec0c5..0cf2a83 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: