Skip to content

Commit

Permalink
git-p4: use marshal format version 2 when sending to p4
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yangskyboxlabs authored and gitster committed Jan 15, 2020
1 parent 5a5577d commit 50da1e7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 50da1e7

Please sign in to comment.