mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git-p4: Fix occasional truncation of symlink contents.
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>
This commit is contained in:
parent
96cb27a9d2
commit
1292df11e8
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue