git p4: fix branch detection with --use-client-spec
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest5 patches 3 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | git p4 test: move client_view() function to libraryt/ t/ | +18 | 0 replies | |
| 2/5 | git p4 test: add broken --use-client-spec --detect-branches testst/ | +77 | 0 replies | |
| 3/5 | git p4: set self.branchPrefixes in initializationgit-p4.py | +14 | 0 replies | |
| 4/5 | git p4: do wildcard decoding in stripRepoPathgit-p4.py | +8 | 0 replies | |
| 5/5 | git p4: make branch detection work with --use-client-specgit-p4.py t/ | +32 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/5] git p4: fix branch detection with --use-client-spec
[email protected] wrote on Fri, 10 Aug 2012 12:14 -0700:
Quoted 4 lines
Using git p4 on git version 1.7.12.rc2 has path issues. Standard clone/sync ops apparently place detected master and branches on independent and parallel directory structures instead of git branches. See http://stackoverflow.com/q/11893688/1588831 for a full demo of the problem.
Thank you for the detailed report. It is a bug in 1.7.12-rc2. This series fixes it, on top of origin/master.
The crux of the matter is that files are mapped into the wrong locations in git when both --use-client-spec and --branch-detection are enabled.
Pete Wyckoff (5):
git p4 test: move client_view() function to library git p4 test: add broken --use-client-spec --detect-branches tests git p4: set self.branchPrefixes in initialization
git p4: do wildcard decoding in stripRepoPath
git p4: make branch detection work with --use-client-spec
git-p4.py | 75 +++++++++++++++++++++++++++-------------- t/lib-git-p4.sh | 18 ++++++++++ t/t9801-git-p4-branch.sh | 77 +++++++++++++++++++++++++++++++++++++++++++ t/t9809-git-p4-client-view.sh | 17 ---------- 4 files changed, 146 insertions(+), 41 deletions(-)
Signature · 1 line
1.7.12.rc2.24.gc304662