| commit | 7f705dc3686c2b1c77172b6847c1406eb66a20c3 | |
| author | Tor Arvid Lund <torarvid@gmail.com> | |
| Thu, 4 Dec 2008 13:37:33 +0000 (4 14:37 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Dec 2008 02:44:16 +0000 (4 18:44 -0800) | ||
| tree | f971b4dd147c60ae081185e4b2aa4239e3678a54 | treesnapshot (tar.gz zip) |
| parent | 304dcf262e3f8524c909a13cf73a67522be6353b | commitdiff |
git-p4: Fix bug in p4Where method.
When running:
p4 where //depot/SomePath/...
The result can in some situations look like:
//depot/SomePath/... //client/SomePath/... /home/user/p4root/SomePath/...
-//depot/SomePath/UndesiredSubdir/... //client/SomePath/UndesiredSubdir/... /home/user/p4root/SomePath/UndesiredSubdir/...
This depends on the users Client view. The current p4Where method will now
return /home/user/p4root/SomePath/UndesiredSubdir/... which is not what we
want. This patch loops through the results from "p4 where", and picks the one
where the depotFile exactly matches the given depotPath (//depot/SomePath/...
in this example).
Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When running:
p4 where //depot/SomePath/...
The result can in some situations look like:
//depot/SomePath/... //client/SomePath/... /home/user/p4root/SomePath/...
-//depot/SomePath/UndesiredSubdir/... //client/SomePath/UndesiredSubdir/... /home/user/p4root/SomePath/UndesiredSubdir/...
This depends on the users Client view. The current p4Where method will now
return /home/user/p4root/SomePath/UndesiredSubdir/... which is not what we
want. This patch loops through the results from "p4 where", and picks the one
where the depotFile exactly matches the given depotPath (//depot/SomePath/...
in this example).
Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/fast-import/git-p4 | diffblobblamehistory |