development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'aj/p4-symlink-lose-nl'

Browse source 
* aj/p4-symlink-lose-nl:
  git-p4: Fix occasional truncation of symlink contents.
This commit is contained in:
Junio C Hamano 2013-09-04 12:36:37 -07:00
commit a62b071d5b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-p4.py
View file

@ -2180,9 +2180,13 @@ def streamOneP4File(self, file, contents):
git_mode = "100755"
if type_base == "symlink":
git_mode = "120000"
# p4 print on a symlink contains "target\n"; remove the newline
# p4 print on a symlink sometimes contains "target\n";
# if it does, remove the newline
data = ''.join(contents)
contents = [data[:-1]]
if data[-1] == '\n':
contents = [data[:-1]]
else:
contents = [data]
if type_base == "utf16":
# p4 delivers different text in the python output to -G