git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c04b3a2 1f5f390)
Merge branch 'ls/p4-translation-failure' into maint
authorJunio C Hamano <redacted>
Tue, 3 Nov 2015 23:32:31 +0000 (15:32 -0800)
committerJunio C Hamano <redacted>
Tue, 3 Nov 2015 23:32:32 +0000 (15:32 -0800)
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

1  2 
git-p4.py patch | diff1 | diff2 | blob | history

diff --cc git-p4.py
Simple merge
git clone https://git.99rst.org/PROJECT