From: Simon Hausmann <simon@lst.de>
Date: Mon, 11 Jun 2007 07:59:27 +0000 (+0200)
Subject: Fix support for explicit disabling of syncing with the origin
X-Git-Tag: v1.5.3-rc0~65^2^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a43ff00c7c2981426d06b3621bbf62476aa5ec0d;p=git.git

Fix support for explicit disabling of syncing with the origin

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 815d8bbb5..ff5618131 100755
--- 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/"