From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:23:48 +0000 (-0700)
Subject: Merge branch 'va/p4-client-path'
X-Git-Tag: v2.5.0-rc0~133
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=04959836795da4c82bc9b12bebdfb294ea12943f;p=git.git

Merge branch 'va/p4-client-path'

git p4 attempts to better handle branches in Perforce.

* va/p4-client-path:
  git-p4: improve client path detection when branches are used
  t9801: check git-p4's branch detection with client spec enabled
---

04959836795da4c82bc9b12bebdfb294ea12943f