| commit | c7bdbd6f92bbab2a030ee8bf7957af25327545e5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:31 +0000 (3 15:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:32 +0000 (3 15:32 -0800) | ||
| tree | 3a3e45b681453411dd07524eac3fd28596e47759 | treesnapshot (tar.gz zip) |
| parent | c04b3a2dbff67605078139f97d4546716e4a1f40 | commitdiff |
| parent | 1f5f3907117021961545e42097829001b58288db | commitdiff |
Merge branch 'ls/p4-translation-failure' into maint
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
* ls/p4-translation-failure:
git-p4: handle "Translation of file content failed"
git-p4: add test case for "Translation of file content failed" error
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.
* ls/p4-translation-failure:
git-p4: handle "Translation of file content failed"
git-p4: add test case for "Translation of file content failed" error
| git-p4.py | diff1 | diff2 | blobhistory |