Browse Source

Create the origin based import branch using git update-ref instead of git branch

so that it's possible to have the import branch in refs/remotes.

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 18 years ago
parent
commit
8ead4fda3f
  1. 5
      contrib/fast-import/git-p4

5
contrib/fast-import/git-p4

@ -836,7 +836,10 @@ class P4Sync(Command): @@ -836,7 +836,10 @@ class P4Sync(Command):
if not gitBranchExists(self.branch) and gitBranchExists("origin"):
if not self.silent:
print "Creating %s branch in git repository based on origin" % self.branch
system("git branch %s origin" % self.branch)
branch = self.branch
if not branch.startswith("refs"):
branch = "refs/heads/" + branch
system("git update-ref %s origin" % branch)

[self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
if len(self.previousDepotPath) > 0 and len(p4Change) > 0:

Loading…
Cancel
Save