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-Tag: v1.5.3-rc0~65^2^2~20^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=db775559c2d866de895cc36532ddff6b1ebbeda9;p=git.git

Fix single branch import into remotes

Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 89581eaca..ad023f203 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/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");