Fix support for explicit disabling of syncing with the origin
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
parent
86fda6a327
commit
a43ff00c7c
@ -1028,6 +1028,8 @@ class P4Sync(Command):
|
|||||||
self.knownBranches = {}
|
self.knownBranches = {}
|
||||||
self.initialParents = {}
|
self.initialParents = {}
|
||||||
self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
|
self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
|
||||||
|
if not self.syncWithOrigin:
|
||||||
|
self.hasOrigin = False
|
||||||
|
|
||||||
if self.importIntoRemotes:
|
if self.importIntoRemotes:
|
||||||
self.refPrefix = "refs/remotes/p4/"
|
self.refPrefix = "refs/remotes/p4/"
|
||||||
|
Loading…
Reference in New Issue
Block a user