commit a43ff00c7c2981426d06b3621bbf62476aa5ec0d
author Simon Hausmann <simon@lst.de> Mon Jun 11 09:59:27 2007 +0200
committer Simon Hausmann <simon@lst.de> Mon Jun 11 09:59:27 2007 +0200
tree 40f53c2928615b8347a14c23dd639f221b4037de
parent 86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1

Fix support for explicit disabling of syncing with the origin

Signed-off-by: Simon Hausmann <simon@lst.de>

contrib/fast-import/git-p4

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 815d8bb..ff56181 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1028,6 +1028,8 @@
         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/"