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>
Miguel Torroja committed
May 28, 2015 at 01:14 UTC
f5f53f141087e8ba663d650399e8683c1fc6700b
1 file changed
+1
-1
git-p4.py
+1
-1
@@ -2145,7 +2145,7 @@ class P4Sync(Command, P4UserMap):
2145
# them back too. This is not needed to the cygwin windows version,
2146
# just the native "NT" type.
2147
#
2148
- text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
2148
+ text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])
2149
if p4_version_string().find("/NT") >= 0:
2150
text = text.replace("\r\n", "\n")
2151
contents = [ text ]