Skip to content

Commit

Permalink
git-p4: Fix occasional truncation of symlink contents.
Browse files Browse the repository at this point in the history
Symlink contents in p4 print sometimes have a trailing
new line character, but sometimes it doesn't. git-p4
should only remove the last character if that character
is '\n'.

Signed-off-by: Alex Juncu <ajuncu@ixiacom.com>
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Alexandru Juncu authored and Junio C Hamano committed Aug 12, 2013
1 parent 96cb27a commit 1292df1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1292df1

Please sign in to comment.