mirror of
https://github.com/frej/fast-export.git
synced 2026-02-04 04:19:03 +01:00
Fix single branch import into remotes
This commit is contained in:
4
git-p4
4
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");
|
||||
|
||||
Reference in New Issue
Block a user