summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2011-09-17 19:16:14 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-17 20:45:28 -0700
commit55aa5714afc1310fd94936a8cd922e868d694bd2 (patch)
tree37f8c46abdbf700cfb2bb2d5812c6b3bc2de51a9 /builtin/diff-files.c
parentgit-p4 tests: refactor and cleanup (diff)
downloadtgif-55aa5714afc1310fd94936a8cd922e868d694bd2.tar.xz
git-p4: handle utf16 filetype properly
One of the filetypes that p4 supports is utf16. Its behavior is odd in this case. The data delivered through "p4 -G print" is not encoded in utf16, although "p4 print -o" will produce the proper utf16-encoded file. When dealing with this filetype, discard the data from -G, and instead read the contents directly. An alternate approach would be to try to encode the data in python. That worked for true utf16 files, but for other files marked as utf16, p4 delivers mangled text in no recognizable encoding. Add a test case to check utf16 handling, and +k and +ko handling. Reported-by: Chris Li <git@chrisli.org> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions