Skip to content
  • Jeff King's avatar
    combine-diff: respect textconv attributes · 0508fe53
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    0508fe53