| commit | 3aa1f7ca3779f73164b285c070b71abcdd7397c1 | |
| author | Jeff King <peff@peff.net> | |
| Tue, 9 Dec 2008 08:13:21 +0000 (9 03:13 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Dec 2008 06:28:55 +0000 (9 22:28 -0800) | ||
| tree | 5c56fd2f96e46ea62202bc063d8d21d36eb618a0 | treesnapshot (tar.gz zip) |
| parent | 0c01857df57fe8723714e49459e0c061fcaf056b | commitdiff |
diff: respect textconv in rewrite diffs
Currently we just skip rewrite diffs for binary files; this
patch makes an exception for files which will be textconv'd,
and actually performs the textconv before generating the
diff.
Conceptually, rewrite diffs should be in the exact same
format as the a non-rewrite diff, except that we refuse to
share any context. Thus it makes very little sense for "git
diff" to show a textconv'd diff, but for "git diff -B" to
show "Binary files differ".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Currently we just skip rewrite diffs for binary files; this
patch makes an exception for files which will be textconv'd,
and actually performs the textconv before generating the
diff.
Conceptually, rewrite diffs should be in the exact same
format as the a non-rewrite diff, except that we refuse to
share any context. Thus it makes very little sense for "git
diff" to show a textconv'd diff, but for "git diff -B" to
show "Binary files differ".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff.c | diffblobblamehistory | |
| t/t4031-diff-rewrite-binary.sh | diffblobblamehistory |