@matheusbsbs / matheus-bagliano / commits / db775559c2
Fork 0

Fix single branch import into remotes

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

Marius Storm-Olsen committed Jun 7, 2007 at 15:13 UTC db775559c2d866de895cc36532ddff6b1ebbeda9
1 file changed +2 -2
contrib/fast-import/git-p4
+2 -2
@@ -1014,7 +1014,7 @@ class P4Sync(Command):
1014 if self.importIntoRemotes:
1015 self.refPrefix = "refs/remotes/p4/"
1016 else:
1017 - self.refPrefix = "refs/heads/"
1017 + self.refPrefix = "refs/heads/p4/"
1018
1019 if self.syncWithOrigin and self.hasOrigin:
1020 if not self.silent:
@@ -1022,7 +1022,7 @@ class P4Sync(Command):
1022 system("git fetch origin")
1023
1024 if len(self.branch) == 0:
1025 - self.branch = self.refPrefix + "p4/master"
1025 + self.branch = self.refPrefix + "master"
1026 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
1027 system("git update-ref %s refs/heads/p4" % self.branch)
1028 system("git branch -D p4");