summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorMiguel Torroja <miguel.torroja@gmail.com>2015-05-28 01:14:39 +0200
committerJunio C Hamano <gitster@pobox.com>2015-05-27 16:23:02 -0700
commitf5f53f141087e8ba663d650399e8683c1fc6700b (patch)
tree4962d42877099e1293d53548a5dbf0e6a080db2c /git-p4.py
parent77bd3ea9f54f1584147b594abc04c26ca516d987 (diff)
downloadgit-f5f53f141087e8ba663d650399e8683c1fc6700b.tar.gz
p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-version
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 41a77e6648..d0df1d92e0 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 ]