mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 01:56:15 +02:00
Code

Always pass a sha1 for the initial parent so that git-fast-import doesn't think 

it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-05-17 09:02:45 +02:00
parent 5c4153e488
commit f9162f6a4c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/fast-import/git-p4
View File

@ -865,7 +865,7 @@ class P4Sync(Command):
self.previousDepotPath = ""
if len(self.branch) == 0:
self.branch = "p4"
self.branch = "refs/remotes/p4"
if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"):
@ -878,11 +878,12 @@ class P4Sync(Command):
p4Change = int(p4Change) + 1
self.depotPath = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change
self.initialParent = self.branch
self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-1]
if not self.silent:
print "Performing incremental import into %s git branch" % self.branch
self.branch = "refs/heads/" + self.branch
if not self.branch.startswith("refs/"):
self.branch = "refs/heads/" + self.branch
if len(self.depotPath) != 0:
self.depotPath = self.depotPath[:-1]