Bite the bullet and automatically convert old style refs/heads/p4 repositories
to the new style refs/remotes/p4 branching. Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
parent
c6d44cb1a1
commit
48df6fd850
@ -832,10 +832,12 @@ class P4Sync(Command):
|
|||||||
defaultImport = False
|
defaultImport = False
|
||||||
|
|
||||||
if len(self.branch) == 0:
|
if len(self.branch) == 0:
|
||||||
if gitBranchExists("refs/heads/p4"):
|
|
||||||
self.branch = "p4"
|
|
||||||
else:
|
|
||||||
self.branch = "refs/remotes/p4/master"
|
self.branch = "refs/remotes/p4/master"
|
||||||
|
if gitBranchExists("refs/heads/p4"):
|
||||||
|
system("git update-ref %s refs/heads/p4" % self.branch)
|
||||||
|
system("git symbolic-ref refs/remotes/p4/HEAD refs/remotes/p4/master")
|
||||||
|
system("git branch -D p4");
|
||||||
|
else:
|
||||||
defaultImport = True
|
defaultImport = True
|
||||||
|
|
||||||
if len(args) == 0:
|
if len(args) == 0:
|
||||||
|
Loading…
Reference in New Issue
Block a user