зеркало из https://github.com/microsoft/git.git
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 <miguel.torroja@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
77bd3ea9f5
Коммит
f5f53f1410
|
@ -2145,7 +2145,7 @@ class P4Sync(Command, P4UserMap):
|
||||||
# them back too. This is not needed to the cygwin windows version,
|
# them back too. This is not needed to the cygwin windows version,
|
||||||
# just the native "NT" type.
|
# just the native "NT" type.
|
||||||
#
|
#
|
||||||
text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
|
text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])
|
||||||
if p4_version_string().find("/NT") >= 0:
|
if p4_version_string().find("/NT") >= 0:
|
||||||
text = text.replace("\r\n", "\n")
|
text = text.replace("\r\n", "\n")
|
||||||
contents = [ text ]
|
contents = [ text ]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче