read

This post is a mixture of things learnt from IRC, educated guesses and the results of many hours of trial and error.

Local & Remote repositories

In Subversion you have one repository which all of your code is submitted to directly when a commit is made. This is very different for Git and is what makes it a “distributed” version control system. A repository can be on a SSH server, GitHub, a local folder or network drive. Each repository is given a nickname, which is called a “remote”.

git remote add origin [email protected]:philsturgeon/pyrocms.gitgit pull origin master

The name of this new remote repository is “origin”, but it can be anything you like.

The pull command fills your local repository with commits from the remote repository for the “master” branch, which is essentially the same as the Subversion “trunk”.

As I mentioned earlier, when you make a commit it doesn’t actually send the changes anywhere. To do that you need to use git push.

git push origin master

This just sends any commits on your local repo to the remote repo.

Summary of point: Subversion only has one repository, Git can have any number from 1 to… lots.

Local & Remote branches

In Subversion seeing as you only have the one repo, all branches exist there and all your commits update that branch straight away. Git has branches stored in two places, local and remote. This idea confused the hell out of me when I first heard about it but after learning to understand point #1, this became very useful.

Git allows you to create a local branch, check it out, work on it and commit to it all offline without contacting the remote repo. Eg:

git branch ticket5git checkout ticket5git commit -a -m "Committing changes"

Then when you are done, you may send all of your commits to the remote branch in ‘origin’ using push again.

git push origin ticket5

This is what the guide meant when it said “You will never directly modify a remote branch.” because you don’t, you work on a copy of that branch then send that copy to the repo when you are done.

Summary of point: You can commit, switch and merge branches offline then send it all off online.

Empty folders

Subversion can add a folder in the same was as you can add a file. Git has a known bug that simply ignores any folder with no files in it. No matter what you do, you cannot add or commit an empty folder. Always just add a index.html or another empty file if that folder needs to be there.

The developers know about this, but to quote from the official Git FAQ:

”…nobody competent enough to make the change to allow empty directories has cared enough about this situation to remedy it.”. Fair enough then.

Summary of point: Make sure each directory has at least one file.

Do not rename

Just don’t even bother trying, it seems to just break at random. It is better to copy the file(s), set the new name and delete the old copy. My worse rename experience was renaming “public_html” to “application” in the PyroCMS repo. It added “application” but kept an empty directory structure of some of “public_html” and it was a nightmare to remove this ghost directory as it did not exist in local copies and could not be pulled or fetched.

Summary of point: Do not rename a thing, copy and delete.

Get a Mac or use Linux

Seriously, do not try install Git on a Windows machine unless you are a masochist: it is NOT worth it. Use anything with a Unix shell and the install will be done in minutes.

That said, installing Git on CentOS 5 was an absolute nightmare for me as well.

If you are using Windows, give SmartGit a try. It actually makes the whole process rather painless.

Summary: Git is one confusion S.O.B when you first start using it, but it soon begins to make sense if you stick with it. Read the manuals, use the command line and try to stop thinking like a Subversion user. Ignore what you know about Subversion and learn Git like it is something brand new. If you can’t forget about Subversion then head my advice here and save yourself the headaches I have suffered the last 2 weeks.

Blog Logo

Phil Sturgeon

Phil has contributed to CodeIgniter, FuelPHP, Laravel and handfuls of other projects, to try and make the PHP community a better place.


Published

Build APIs You Won't Hate

Everyone and their dog wants an API, so you should probably learn how to build them.

Buy it from LeanPub for $26.99


Published 01 Feb 2014

Image

Phil Sturgeon

Founder of PyroCMS, Senior Developer at Ride, Programming Polyglot, PHP-FIG member, and occasionally gets chased by bears

Back to Overview