| commit | 0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 23 May 2011 20:31:05 +0000 (23 16:31 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 May 2011 16:08:17 +0000 (24 09:08 -0700) | ||
| tree | 748d9bcd266ca173d6269a07c95343ccc8cf2a76 | treesnapshot (tar.gz zip) |
| parent | 3813e69031d2df2702f50b9649fa2e40ea11e558 | commitdiff |
combine-diff: respect textconv attributes
When doing a combined diff, we did not respect textconv attributes at
all. This generally lead to us printing "Binary files differ" when we
could show a combined diff of the converted text.
This patch converts file contents according to textconv attributes. The
implementation is slightly ugly; because the textconv code is tightly
linked with the diff_filespec code, we temporarily create a diff_filespec
during conversion. In practice, though, this should not create a
performance problem.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When doing a combined diff, we did not respect textconv attributes at
all. This generally lead to us printing "Binary files differ" when we
could show a combined diff of the converted text.
This patch converts file contents according to textconv attributes. The
implementation is slightly ugly; because the textconv code is tightly
linked with the diff_filespec code, we temporarily create a diff_filespec
during conversion. In practice, though, this should not create a
performance problem.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| combine-diff.c | diffblobblamehistory | |
| t/t4048-diff-combined-binary.sh | diffblobblamehistory |