From: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
Date: Thu, 7 Jun 2007 13:13:59 +0000 (+0200)
Subject: Fix single branch import into remotes
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=275f02aadc503f375d08613cde3bec26509ae7f1;p=python%2Ffast-export.git

Fix single branch import into remotes
---

diff --git a/git-p4 b/git-p4
index 89581ea..ad023f2 100755
--- a/git-p4
+++ b/git-p4
@@ -1014,7 +1014,7 @@ class P4Sync(Command):
         if self.importIntoRemotes:
             self.refPrefix = "refs/remotes/p4/"
         else:
-            self.refPrefix = "refs/heads/"
+            self.refPrefix = "refs/heads/p4/"
 
         if self.syncWithOrigin and self.hasOrigin:
             if not self.silent:
@@ -1022,7 +1022,7 @@ class P4Sync(Command):
             system("git fetch origin")
 
         if len(self.branch) == 0:
-            self.branch = self.refPrefix + "p4/master"
+            self.branch = self.refPrefix + "master"
             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
                 system("git update-ref %s refs/heads/p4" % self.branch)
                 system("git branch -D p4");