]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0742b7c) | patch
git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
authorLuke Diamand <luke@diamand.org>
Mon, 15 Oct 2018 11:14:07 +0000 (12:14 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 04:28:49 +0000 (13:28 +0900)
commit088131273b7e781174eb1cffb7d4e0eb51066cba
tree4c53c5dfb2610c6825b5beca6aa0c0696154accdtree | snapshot
parent0742b7c860a4291868dec79b90a217db6b129d2bcommit | diff
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>
Documentation/git-p4.txt diff | blob | history
git-p4.py diff | blob | history
t/t9832-unshelve.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.