Migrate from Subversion to git, clone all branches and push through gitolite?

Question

I've been working on moving our 9 projects in one SVN repo over to 9 separate git repos, managed on a server by gitolite then shutting down SVN. Seven of them were easy as they had no branches or tags so on my workstation I was able to do a simple:

git svn clone --stdlayout --no-metadata -A svnauthors.txt svn+ssh://user@host/var/subversion/project tempProject

Then pushed from my workstation to the gitolite sever via:

 git remote add origin ssh://gitolite@host/project
 git push -u origin master

and they have all been working great. Now the final two projects are more difficult, having about 30 tags/branches each. After running the 'git svn clone' as above on one of those projects I see:

$ git branch -a
* master
  remotes/BatchUpload
  remotes/clarify_breadcrumb
  remotes/contact_type
  remotes/contact_upload_improvements
  remotes/file_cabinet
  remotes/mobile
  remotes/summary_tiles
  remotes/summary_updates
  remotes/tags/release-2.1.2
  remotes/tags/release-3.0.1
  remotes/tags/release-3.0.2
  remotes/tags/release-3.0.2c
  remotes/tags/release-3.1.1
  remotes/tags/release-3.1.3
  remotes/tags/release-3.1.4
  remotes/tags/release-3.1.5
  remotes/tags/release-3.1.5.UPDT
  remotes/tags/release-3.2
  remotes/tags/release-3.2.1
  remotes/tags/release-3.2.2.1
  remotes/tags/release-3.2.3
  remotes/tags/release-3.2.4
  remotes/tags/release-3.2.6
  remotes/tags/release-3.2.7
  remotes/tags/release-3.2.7.1
  remotes/trunk
  remotes/user_man_batch_upload
  remotes/user_management

Now how do I go about getting all those tags/branches downloaded to my local workstation so I can push them through gitolite and shutdown the SVN server permanently? Is what I need to do in this guide, doing a 'git checkout -b' for each branch and tag? Should I be using svn2git or some other tool for this?

Answer 1

A helpful person in #git on freenode irc wrote me a little command to get my tags and branches copied over to Git from SVN:

Push branches:

printf "git push origin "; git show-ref | grep refs/remotes | grep -v '@' | grep -v remotes/tags | perl -ne 'print "refs/remotes/$1:refs/heads/$1 " if m!refs/remotes/(.*)!'; echo

Run command which that prints out

Push tags:

printf "git push origin "; git show-ref | grep refs/remotes/tags | grep -v '@' | perl -ne 'print "refs/remotes/tags/$1:refs/tags/$1 " if m!refs/remotes/tags/(.*)!'; echo

Run command which that prints out

Answer 2

You can list all remote references created when migrating from svn to git: git show-ref (available from git 1.8.2.2). Then decide to push them to origin.

To push all references as branches to origin:

git push origin refs/remotes/*:refs/heads/*

To push tags to origin:

git push origin refs/tags/*:refs/tags/*
-or-
git push origin --tags

You may need to clean up these branches, or perhaps convert some branches to tags before / after the push.

Answer 3

They already are on your local workstation. What you see is only references to commits and you can check out local branches tracking them whenever you like.

git branch -a

Show information that's in your local repo, not fetching any data from the remote repository. You got all that information when you did the clone.

So now that we have everything local you only need to push the data to the remote. You can push all your tags to the remote server with:

git push --tags

For each branch you can push it to the repo with:

git push origin remotes/BatchUpload:BatchUpload

Answer 4

Use svn2git. This converts the tags into git annotated tags and these are then pushed properly using git push --tags