git-p4: Fix checkout bug when using --import-local.
When this option is passed to git p4 clone, the checkout at the end would previously fail. This patch fixes it by optionally creating the master branch from refs/heads/p4/master, which is the correct one for this option. Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Acked-By: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
61c5d431de
commit
e990501312
@ -1748,8 +1748,12 @@ class P4Clone(P4Sync):
|
||||
if not P4Sync.run(self, depotPaths):
|
||||
return False
|
||||
if self.branch != "master":
|
||||
if gitBranchExists("refs/remotes/p4/master"):
|
||||
system("git branch master refs/remotes/p4/master")
|
||||
if self.importIntoRemotes:
|
||||
masterbranch = "refs/remotes/p4/master"
|
||||
else:
|
||||
masterbranch = "refs/heads/p4/master"
|
||||
if gitBranchExists(masterbranch):
|
||||
system("git branch master %s" % masterbranch)
|
||||
system("git checkout -f")
|
||||
else:
|
||||
print "Could not detect main branch. No checkout/master branch created."
|
||||
|
Loading…
Reference in New Issue
Block a user