Fix support for explicit disabling of syncing with the origin

This commit is contained in:
Simon Hausmann
2007-06-11 09:59:27 +02:00
parent 883791be16
commit d0b4b5c1ad

2
git-p4
View File

@@ -1028,6 +1028,8 @@ class P4Sync(Command):
self.knownBranches = {}
self.initialParents = {}
self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
if not self.syncWithOrigin:
self.hasOrigin = False
if self.importIntoRemotes:
self.refPrefix = "refs/remotes/p4/"