diff options
author | Vitor Antunes <vitor.hda@gmail.com> | 2015-04-21 23:49:30 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-23 10:17:02 -0700 |
commit | cd88410618d9068f17ba5de0f9959e4ec4f42789 (patch) | |
tree | a6974736840d0bc1adcffbf37e5ab51a305f5cce /t/t9600-cvsimport.sh | |
parent | t9801: check git-p4's branch detection with client spec enabled (diff) | |
download | tgif-cd88410618d9068f17ba5de0f9959e4ec4f42789.tar.xz |
git-p4: improve client path detection when branches are used
Perforce allows client side file/directory remapping through
the use of the client view definition that is part of the
user's client spec.
To support this functionality while branch detection is
enabled it is important to determine the branch location in
the workspace such that the correct files are patched before
Perforce submission. Perforce provides a command that
facilitates this process: p4 where.
This patch does two things to fix improve file location
detection when git-p4 has branch detection and use of client
spec enabled:
1. Enable usage of "p4 where" when Perforce branches exist
in the git repository, even when client specification is
used. This makes use of the already existing function
p4Where.
2. Allow identifying partial matches of the branch's depot
path while processing the output of "p4 where". For
robustness, paths will only match if ending in "/...".
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9600-cvsimport.sh')
0 files changed, 0 insertions, 0 deletions