mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ls/p4-retry-thrice'
A recent updates to "git p4" was not usable for older p4 but it could be made to work with minimum changes. Do so. * ls/p4-retry-thrice: git-p4: do not pass '-r 0' to p4 commands
This commit is contained in:
commit
74f7427f8a
|
@ -479,6 +479,8 @@ git-p4.client::
|
||||||
git-p4.retries::
|
git-p4.retries::
|
||||||
Specifies the number of times to retry a p4 command (notably,
|
Specifies the number of times to retry a p4 command (notably,
|
||||||
'p4 sync') if the network times out. The default value is 3.
|
'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
|
Clone and sync variables
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
|
@ -83,7 +83,9 @@ def p4_build_cmd(cmd):
|
||||||
if retries is None:
|
if retries is None:
|
||||||
# Perform 3 retries by default
|
# Perform 3 retries by default
|
||||||
retries = 3
|
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):
|
if isinstance(cmd,basestring):
|
||||||
real_cmd = ' '.join(real_cmd) + ' ' + cmd
|
real_cmd = ' '.join(real_cmd) + ' ' + cmd
|
||||||
|
|
Loading…
Reference in a new issue