[PATCH 0/5] git p4: fix branch detection with --use-client-spec

From: Pete Wyckoff <pw@padd.com>
Date: Aug 11, 2012, 16:51 UTC
Message-ID: <20120811165143.GA2004@padd.com>
In-Reply-To: <CANWnr5aqswATTM9_Zyw=w_x01=e8CqoCsn0Ybee0XvGSJ3F_yw@mail.gmail.com>

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. 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(-)

-- 
1.7.12.rc2.24.gc304662