From f5f53f141087e8ba663d650399e8683c1fc6700b Mon Sep 17 00:00:00 2001
From: Miguel Torroja <miguel.torroja@gmail.com>
Date: Thu, 28 May 2015 01:14:39 +0200
Subject: [PATCH] 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>
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 41a77e6648d..d0df1d92e0e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2145,7 +2145,7 @@ class P4Sync(Command, P4UserMap):
# them back too. This is not needed to the cygwin windows version,
# 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:
text = text.replace("\r\n", "\n")
contents = [ text ]