| commit | 7c88ec05767f283184dc325f43c5fc292128a8a5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Sep 2012 18:08:27 +0000 (7 11:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Sep 2012 18:08:27 +0000 (7 11:08 -0700) | ||
| tree | fdb7af7a0fc01098613ea4af1f46f561c6cc1d77 | treesnapshot (tar.gz zip) |
| parent | 800981f40df7de20216f0b364a138fbf5c16b824 | commitdiff |
| parent | 21ef5df4315b8f4f45bffb6af54d1ea338cb2cf5 | commitdiff |
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
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