Skip to content

Commit 50da1e7

Browse files
yangskyboxlabsgitster
authored andcommitted
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 <[email protected]> Reviewed-by: Ben Keene <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5a5577d commit 50da1e7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-p4.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,8 @@ def modifyChangelistUser(self, changelist, newUser):
16791679
c = changes[0]
16801680
if c['User'] == newUser: return # nothing to do
16811681
c['User'] = newUser
1682-
input = marshal.dumps(c)
1682+
# p4 does not understand format version 3 and above
1683+
input = marshal.dumps(c, 2)
16831684

16841685
result = p4CmdList("change -f -i", stdin=input)
16851686
for r in result:

0 commit comments

Comments
 (0)