From d0b4b5c1ad39296e987f4fc1a171b158308ce33c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon@lst.de>
Date: Mon, 11 Jun 2007 09:59:27 +0200
Subject: [PATCH] Fix support for explicit disabling of syncing with the origin

---
 git-p4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-p4 b/git-p4
index 815d8bb..ff56181 100755
--- a/git-p4
+++ b/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/"
-- 
2.11.0