Merge branch 'ls/p4-retry-thrice'

diff --git a/git-p4.py b/git-p4.py
index 1d4bfe64e298849f37e3a13b138a2f6f2c2b27e7..13bf44768b352c2cd5b34e718bdc7aaef7d6014d 100755 (executable)
--- 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