Fix support for explicit disabling of syncing with the origin

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 815d8bbb5d73ff79072602457c776b654e97a11d..ff56181310988de13f5eef0232c255bdcc4d1910 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -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/"