summaryrefslogtreecommitdiff
path: root/t/t1012-read-tree-df.sh
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2013-01-26 22:11:12 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-26 22:00:39 -0800
commitbb5ea62d80313f6fd37f3f3c214c78feb34036f9 (patch)
tree7caf23216d44c850fc7bf3bf8ba50c3fe8a17c82 /t/t1012-read-tree-df.sh
parentgit p4 test: translate windows paths for cygwin (diff)
downloadtgif-bb5ea62d80313f6fd37f3f3c214c78feb34036f9.tar.xz
git p4: remove unreachable windows \r\n conversion code
Replacing \r\n with \n on windows was added in c1f9197 (Replace \r\n with \n when importing from p4 on Windows, 2007-05-24), to work around an oddity with "p4 print" on windows. Text files are printed with "\r\r\n" endings, regardless of whether they were created on unix or windows, and regardless of the client LineEnd setting. As of d2c6dd3 (use p4CmdList() to get file contents in Python dicts. This is more robust., 2007-05-23), git-p4 uses "p4 -G print", which generates files in a raw format. As the native line ending format if p4 is \n, there will be no \r\n in the raw text. Actually, it is possible to generate a text file so that the p4 representation includes embedded \r\n, even though this is not normal on either windows or unix. In that case the code would have mistakenly stripped them out, but now they will be left intact. More information on how p4 deals with line endings is here: http://kb.perforce.com/article/63 Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1012-read-tree-df.sh')
0 files changed, 0 insertions, 0 deletions