Fix support for explicit disabling of syncing with the origin
Signed-off-by: Simon Hausmann <simon@lst.de>
Simon Hausmann committed
Jun 11, 2007 at 09:59 UTC
a43ff00c7c2981426d06b3621bbf62476aa5ec0d
1 file changed
+2
contrib/fast-import/git-p4
+2
@@ -1028,6 +1028,8 @@ class P4Sync(Command):
1028
self.knownBranches = {}
1029
self.initialParents = {}
1030
self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
1031
+ if not self.syncWithOrigin:
1032
+ self.hasOrigin = False
1033
1034
if self.importIntoRemotes:
1035
self.refPrefix = "refs/remotes/p4/"