summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:12 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:12 -0800
commit74f7427f8a7a6f8ac87e9f1bb1b140cd034f428d (patch)
treea13bab342f4d0161f57d2d0a46456d264a962b77 /git-p4.py
parent3ccd681c2ab11522591be8a7a3eddb1a85a43ab0 (diff)
parentbc233524c96518c04650d297ad81a9c948fc2e41 (diff)
downloadgit-74f7427f8a7a6f8ac87e9f1bb1b140cd034f428d.tar.gz
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 22e3f57e7d..7bda915bd0 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -83,7 +83,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