diff options
| author |  Luke Diamand <luke@diamand.org> | 2018-10-15 12:14:07 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-16 13:28:49 +0900 |
| commit | 088131273b7e781174eb1cffb7d4e0eb51066cba (patch) | |
| tree | 4c53c5dfb2610c6825b5beca6aa0c0696154accd /Documentation | |
| parent | git-p4: do not fail in verbose mode for missing 'fileSize' key (diff) | |
| download | tgif-088131273b7e781174eb1cffb7d4e0eb51066cba.tar.xz | |
git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
The branch detection code looks for branches under refs/remotes/p4/...
and can end up getting confused if there are unshelved changes in
there as well. This happens in the function p4BranchesInGit().
Instead, put the unshelved changes into refs/remotes/p4-unshelved/<N>.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 41780a5aa9..6c0017e36e 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -174,7 +174,7 @@ $ git p4 submit --update-shelve 1234 --update-shelve 2345 Unshelve ~~~~~~~~ Unshelving will take a shelved P4 changelist, and produce the equivalent git commit -in the branch refs/remotes/p4/unshelved/<changelist>. +in the branch refs/remotes/p4-unshelved/<changelist>. The git commit is created relative to the current origin revision (HEAD by default). If the shelved changelist's parent revisions differ, git-p4 will refuse to unshelve; @@ -182,13 +182,13 @@ you need to be unshelving onto an equivalent tree. The origin revision can be changed with the "--origin" option. -If the target branch in refs/remotes/p4/unshelved already exists, the old one will +If the target branch in refs/remotes/p4-unshelved already exists, the old one will be renamed. ---- $ git p4 sync $ git p4 unshelve 12345 -$ git show refs/remotes/p4/unshelved/12345 +$ git show p4-unshelved/12345 <submit more changes via p4 to the same files> $ git p4 unshelve 12345 <refuses to unshelve until git is in sync with p4 again> |