From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2017 23:12:12 +0000 (-0800)
Subject: Merge branch 'ls/p4-retry-thrice'
X-Git-Tag: v2.12.0-rc0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74f7427f8a7a6f8ac87e9f1bb1b140cd034f428d;p=thirdparty%2Fgit.git

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
---

74f7427f8a7a6f8ac87e9f1bb1b140cd034f428d