Igor Kromin |   Consultant. Coder. Blogger. Tinkerer. Gamer.

NOTE: This article is 3 years or older so its information may no longer be relevant. Read on at your own discretion! Comments for this article have automatically been locked, refer to the FAQ for more details.
We've been moving all our code from Subversion to Git at work. As we've gone through this activity it made sense to split up some of the repositories to separate some of the source files more logically. Specifically what we wanted to do was move all of rarely updated library and utility type projects into a 'utils' repository while keeping the frequently updated projects in a 'main' repository. The catch was that we had to do this on a 'development' branch and we wanted to preserve the history of the projects that were being split into their own repository.

I tried to follow this article and the various comments left within it, but none of it seemed to work for me. That article naturally assumed that the master branch was being used. I've made some tweaks and came up with my own set of commands to do this that takes branches into account.

Objective: On branch 'dev', move directory 'LibProject1' from Git repository 'source-main' to 'source-utils' while preserving history of commits for that directory.
Assumption: Both source and target repositories have the same branch name set up. This is not a hard requirement and can be tweaked in the commands below but this is what I needed in my case.
 Git Details
Source Repository URL: [email protected]:user/source-main.git
Target Repository URL: [email protected]:user/source-utils.git
Branch: dev
Directory to move: LibProject1


Here is the first part, cloning the source repository and extracting just the directory you want to move...
 Git Commands
git clone [email protected]:user/source-main.git --branch dev --single-branch srcrepo
cd srcrepo
git remote rm origin
git filter-branch --subdirectory-filter LibProject1 -- --all
mkdir LibProject1
mv * LibProject1
git add .
git commit


At this point there is a Git repository that's been disconnected from the remote repository and contains just the directory that we're interested in moving.

We don't want to continue working in the source repository directory, so go up a directory...
 Git Commands
cd ..


Now comes the second part, cloning the target repository, creating a remote connection to the source as a branch and pulling in the contents of the branch before finally pushing the changes up to the target remote repository.
 Git Commands
git clone [email protected]:user/source-utils.git --branch dev --single-branch trgtrepo
cd trgtrepo
git remote add tmpbranch ../srcrepo
git pull tmpbranch dev
git remote rm tmpbranch
git push




That's pretty much it. Now the target repository has the contents and history of the directory you wanted moved over. The original directory can be deleted from the source repository at this stage, also the srcrepo and trgtrepo directories that were created during this process should now be removed as well.

-i

Skip down to comments...
Hope you found this post useful...

...so please read on! I love writing articles that provide beneficial information, tips and examples to my readers. All information on my blog is provided free of charge and I encourage you to share it as you wish. There is a small favour I ask in return however - engage in comments below, provide feedback, and if you see mistakes let me know.

If you want to show additional support and help me pay for web hosting and domain name registration, donations, no matter how small, are always welcome!

Use of any information contained in this blog post/article is subject to this disclaimer.
 
comments powered by Disqus
Other posts you may like...