зеркало из https://github.com/microsoft/git.git
git-p4: do not pass '-r 0' to p4 commands
git-p4 crashes when used with a very old p4 client version that does not support the '-r <number>' option in its commands. Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0. Alternatively git-p4.retries could be made opt-in. But since only very old, barely maintained p4 versions don't support the '-r' option, the setting-retries-to-0 workaround would do. The "-r retries" option is present in Perforce 2012.2 Command Reference, but absent from Perforce 2012.1 Command Reference. Signed-off-by: Igor Kushnir <igorkuo@gmail.com> Acked-by: Lars Schneider <larsxschneider@gmail.com> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
89a6ecc55b
Коммит
bc233524c9
|
@ -470,6 +470,8 @@ git-p4.client::
|
|||
git-p4.retries::
|
||||
Specifies the number of times to retry a p4 command (notably,
|
||||
'p4 sync') if the network times out. The default value is 3.
|
||||
Set the value to 0 to disable retries or if your p4 version
|
||||
does not support retries (pre 2012.2).
|
||||
|
||||
Clone and sync variables
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
|
@ -82,7 +82,9 @@ def p4_build_cmd(cmd):
|
|||
if retries is None:
|
||||
# Perform 3 retries by default
|
||||
retries = 3
|
||||
real_cmd += ["-r", str(retries)]
|
||||
if retries > 0:
|
||||
# Provide a way to not pass this option by setting git-p4.retries to 0
|
||||
real_cmd += ["-r", str(retries)]
|
||||
|
||||
if isinstance(cmd,basestring):
|
||||
real_cmd = ' '.join(real_cmd) + ' ' + cmd
|
||||
|
|
Загрузка…
Ссылка в новой задаче