summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-16 15:27:50 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-16 15:27:50 -0800
commit2a72b69407c5769db1519f82e7a10d98a3ab0352 (patch)
tree4fc7cc2a603e82d85ed626c1a29d9f4f7c47c04e /git-p4.py
parent796bd3bb2ac98e6aa4cb9afccc18c3056f795196 (diff)
parent89a6ecc55b55ae87c39c5d9edb115731550fba95 (diff)
downloadgit-2a72b69407c5769db1519f82e7a10d98a3ab0352.tar.gz
Merge branch 'ls/p4-retry-thrice'
* ls/p4-retry-thrice: git-p4: add config to retry p4 commands; retry 3 times by default
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-p4.py b/git-p4.py
index 1d4bfe64e2..13bf44768b 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -78,6 +78,11 @@ def p4_build_cmd(cmd):
if len(client) > 0:
real_cmd += ["-c", client]
+ retries = gitConfigInt("git-p4.retries")
+ if retries is None:
+ # Perform 3 retries by default
+ retries = 3
+ real_cmd += ["-r", str(retries)]
if isinstance(cmd,basestring):
real_cmd = ' '.join(real_cmd) + ' ' + cmd