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 коммит произвёл Junio C Hamano
Родитель 5a5577d808
Коммит 50da1e7393
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -1679,7 +1679,8 @@ class P4Submit(Command, P4UserMap):
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: