mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-03 22:28:09 +02:00
Code

git-p4: use marshal format version 2 when sending to p4 

p4 does not appear to understand marshal format version 3 and above.
Version 2 was the latest supported by python-2.7.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Reviewed-by: Ben Keene <seraphire@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Yang Zhao 2019-12-13 15:52:42 -08:00 committed by Junio C Hamano
parent 5a5577d808
commit 50da1e7393
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-p4.py
View File

@ -1679,7 +1679,8 @@ def modifyChangelistUser(self, changelist, newUser):
c = changes[0]
if c['User'] == newUser: return # nothing to do
c['User'] = newUser
input = marshal.dumps(c)
# p4 does not understand format version 3 and above
input = marshal.dumps(c, 2)
result = p4CmdList("change -f -i", stdin=input)
for r in result: