Merge branch 'va/p4-client-path' into next
commit852facc8ce97f26be971ac413a3e6cc892f8c967
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:35 +0000 (5 21:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:35 +0000 (5 21:14 -0700)
tree06ee3941ca62a6ddd5cb06ccce7c55b828f3d163
parentc556011860fd5b98e52e54330f0e3097201a52bd
parentcd88410618d9068f17ba5de0f9959e4ec4f42789
Merge branch 'va/p4-client-path' into next

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
git-p4.py