Re: [PATCH 0/5] git p4: fix branch detection with --use-client-spec
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 12, 2012, 04:41 UTC
- Message-ID
- <7v4no8hgc0.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20120811165143.GA2004@padd.com>
Pete Wyckoff <pw@padd.com> writes:
Show 7 quoted lines
> matthew@korich.net wrote on Fri, 10 Aug 2012 12:14 -0700: >> 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.
Do you mean "a feature that was present in 1.7.11 without this bug was broken when used with 1.7.12-rc2"? Or do you mean "this bug exists in 1.7.12-rc2 (older versions may or may not have it, but I am stressing that it is not fixed)"?
The description for [PATCH 5/5] blames v1.7.9-rc0~4^2~1, which tells me it is the latter. And if that were the case, and if this were in the area of the system I oversee, I wouldn't push it to the upcoming release at this late in the cycle, when I do not know what other things it might break while fixing this bug (in other words, a fix to an old bug is not an execuse to introduce a regression).
But git-p4 is not in my area, so if you meant this should go in the upcoming 1.7.12 release, I'll queue them directly on 'master'.
Please tell me what your preference is.
Thanks.
Show 18 quoted lines
> 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(-)