summaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2011-12-24 21:07:39 -0500
committerJunio C Hamano <gitster@pobox.com>2011-12-27 10:19:31 -0800
commit09fca77b9ecd64e2008835208bab29e15a4b2809 (patch)
treeb4a7e2c95118b4d39b562ba18592d43c2bb6a5ce /Documentation/git-p4.txt
parentae3f41f20a0b5a9fa3e83a12557c887855b920f3 (diff)
downloadgit-09fca77b9ecd64e2008835208bab29e15a4b2809.tar.gz
git-p4: test and document --use-client-spec
The depot path is required, even with this option. Make sure git-p4 fails and exits with non-zero. Contents in the specified depot path will be rearranged according to the client spec. Test this and add a note in the docs. Leave an XXX suggesting that this is somewhat confusing behavior that might be good to fix later. Function stripRepoPath() looks at self.useClientSpec. Make sure this is set both for command-line option --use-client-spec and for configuration variable git-p4.useClientSpec. Test this. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
-rw-r--r--Documentation/git-p4.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 9930829139..9a7cdea0f1 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -232,7 +232,10 @@ git repository:
Use a client spec to find the list of interesting files in p4.
The client spec is discovered using 'p4 client -o' which checks
the 'P4CLIENT' environment variable and returns a mapping of
- depot files to workspace files.
+ depot files to workspace files. Note that a depot path is
+ still required, but files found in the path that match in
+ the client spec view will be laid out according to the client
+ spec.
Clone options
~~~~~~~~~~~~~