Skip to content

Commit f5f53f1

Browse files
migueltorrojagitster
authored andcommitted
p4: retrieve the right revision of the file in UTF-16 codepath
Fixing bug with UTF-16 files when they are retrieved by git-p4. It was always getting the tip version of the file and the history of the file was lost. Signed-off-by: Miguel Torroja <[email protected]> Acked-by: Luke Diamand <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 77bd3ea commit f5f53f1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2145,7 +2145,7 @@ def streamOneP4File(self, file, contents):
21452145
# them back too. This is not needed to the cygwin windows version,
21462146
# just the native "NT" type.
21472147
#
2148-
text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
2148+
text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])
21492149
if p4_version_string().find("/NT") >= 0:
21502150
text = text.replace("\r\n", "\n")
21512151
contents = [ text ]

0 commit comments

Comments
 (0)