diff --git a/combine-diff.c b/combine-diff.c
index 31ec0c5165fec5e26b14c2b8eb5df4dc2f63604a..0cf2a830b5dad5c82d8a127cd57c8a8cba195631 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
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: