commit db775559c2d866de895cc36532ddff6b1ebbeda9
author Marius Storm-Olsen <mstormo_git@storm-olsen.com> Thu Jun 07 15:13:59 2007 +0200
committer Marius Storm-Olsen <mstormo_git@storm-olsen.com> Thu Jun 07 15:13:59 2007 +0200
tree b111341a4ac9f0eb06f613eaa3ddbd6b11613efe
parent 98ad4faf95c1e98d6f1aaccda6d96a00a3cddeed

Fix single branch import into remotes

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

contrib/fast-import/git-p4

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 89581ea..ad023f2 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1014,7 +1014,7 @@
         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 @@
             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");