summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2018-10-15 11:14:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 04:28:49 (GMT)
commit088131273b7e781174eb1cffb7d4e0eb51066cba (patch)
tree4c53c5dfb2610c6825b5beca6aa0c0696154accd /git-p4.py
parent0742b7c860a4291868dec79b90a217db6b129d2b (diff)
downloadgit-088131273b7e781174eb1cffb7d4e0eb51066cba.zip
git-088131273b7e781174eb1cffb7d4e0eb51066cba.tar.gz
git-088131273b7e781174eb1cffb7d4e0eb51066cba.tar.bz2
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 'git-p4.py')
-rwxr-xr-xgit-p4.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 5701bad..76c18a2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3956,7 +3956,8 @@ class P4Unshelve(Command):
]
self.verbose = False
self.noCommit = False
- self.destbranch = "refs/remotes/p4/unshelved"
+ self.destbranch = "refs/remotes/p4-unshelved"
+ self.origin = "p4/master"
def renameBranch(self, branch_name):
""" Rename the existing branch to branch_name.N