Bite the bullet and automatically convert old style refs/heads/p4 repositories
to the new style refs/remotes/p4 branching.
Signed-off-by: Simon Hausmann <simon@lst.de>
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3cc6481..cb9961a 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -832,10 +832,12 @@
defaultImport = False
if len(self.branch) == 0:
+ self.branch = "refs/remotes/p4/master"
if gitBranchExists("refs/heads/p4"):
- self.branch = "p4"
+ system("git update-ref %s refs/heads/p4" % self.branch)
+ system("git symbolic-ref refs/remotes/p4/HEAD refs/remotes/p4/master")
+ system("git branch -D p4");
else:
- self.branch = "refs/remotes/p4/master"
defaultImport = True
if len(args) == 0:
