From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Sep 2012 18:08:27 +0000 (-0700)
Subject: Merge branch 'pw/p4-use-client-spec-branch-detection'
X-Git-Tag: v1.8.0-rc0~100
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c88ec05767f283184dc325f43c5fc292128a8a5;p=git.git

Merge branch 'pw/p4-use-client-spec-branch-detection'

Fix "git p4" when "--use-client-spec" and "--detect-branches" are
used together (the command used to misdetect branches).

* pw/p4-use-client-spec-branch-detection:
  git p4: make branch detection work with --use-client-spec
  git p4: do wildcard decoding in stripRepoPath
  git p4: set self.branchPrefixes in initialization
  git p4 test: add broken --use-client-spec --detect-branches tests
  git p4 test: move client_view() function to library
---

7c88ec05767f283184dc325f43c5fc292128a8a5