| commit | 088131273b7e781174eb1cffb7d4e0eb51066cba | |
| author | Luke Diamand <luke@diamand.org> | |
| Mon, 15 Oct 2018 11:14:07 +0000 (15 12:14 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Oct 2018 04:28:49 +0000 (16 13:28 +0900) | ||
| tree | 4c53c5dfb2610c6825b5beca6aa0c0696154accd | treesnapshot (tar.gz zip) |
| parent | 0742b7c860a4291868dec79b90a217db6b129d2b | commitdiff |
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>
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>
| Documentation/git-p4.txt | diffblobblamehistory | |
| git-p4.py | diffblobblamehistory | |
| t/t9832-unshelve.sh | diffblobblamehistory |