summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarius Storm-Olsen <mstormo_git@storm-olsen.com>2007-06-07 13:13:59 (GMT)
committerMarius Storm-Olsen <mstormo_git@storm-olsen.com>2007-06-07 13:13:59 (GMT)
commitdb775559c2d866de895cc36532ddff6b1ebbeda9 (patch)
treeb111341a4ac9f0eb06f613eaa3ddbd6b11613efe /contrib
parent98ad4faf95c1e98d6f1aaccda6d96a00a3cddeed (diff)
downloadgit-db775559c2d866de895cc36532ddff6b1ebbeda9.zip
git-db775559c2d866de895cc36532ddff6b1ebbeda9.tar.gz
git-db775559c2d866de895cc36532ddff6b1ebbeda9.tar.bz2
Fix single branch import into remotes
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 2 insertions, 2 deletions
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 @@ 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");