Merge branch 'pw/p4-use-client-spec-branch-detection'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:08:27 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:08:27 +0000 (11:08 -0700)
commit7c88ec05767f283184dc325f43c5fc292128a8a5
treefdb7af7a0fc01098613ea4af1f46f561c6cc1d77
parent800981f40df7de20216f0b364a138fbf5c16b824
parent21ef5df4315b8f4f45bffb6af54d1ea338cb2cf5
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