git-p4: honor client spec when unshelving - #2386
cazador481 wants to merge 1 commit into
Conversation
Welcome to GitGitGadgetHi @cazador481, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax: NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description, Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txtTo iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description): To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
|
Invalid author email in 72ac0b8: "cazador481@users.noreply.github.com" |
72ac0b8 to
0ac6717
Compare
|
There are issues in commit 0ac6717:
|
|
/allow |
0ac6717 to
89cf536
Compare
|
Error: User cazador481 is not yet permitted to use GitGitGadget |
|
There is an issue in commit 89cf536:
|
When git-p4.useclientspec is enabled, P4Unshelve creates P4Sync without loading its client-spec mapping. Unshelved files are then placed relative to depot paths rather than client-relative paths. Initialize the mapping before unshelving and add a regression test covering a depot-to-client remap. Signed-off-by: cazador481 <eddie@ashfamily.net>
89cf536 to
842ab0b
Compare
Description
When
git-p4.useclientspecis enabled,git p4 unshelvecreates aP4Syncinstance without initializing its client-spec mapping. The unshelved files are therefore written relative to the depot path instead of their client-relative paths.Initialize the client-spec mapping in
P4Unshelve.run()and add a regression test covering a depot-to-client remap.Testing
make -j4make test T=t9832-unshelve.sh(skipped: this environment does not havep4/p4d)make test T=t9809-git-p4-client-view.sh(skipped: this environment does not havep4/p4d)python3 -m py_compile git-p4.pysh -n t/t9832-unshelve.shgit diff --checkGitHub Issues are disabled for
git/git, so the problem description is included here as the issue record.