EGit/Git For Eclipse Users
This post is aimed at those who have been using Eclipse for a while, and probably have been either using the baked-in CVS or external SVN providers to store their source code. The content of the post is about Git; what it means to you, as an Eclipse user – and specifically, how it affects how you obtain or work with projects from Eclipse.org.
This post is not about the relative merits of Git over CVS/SVN, or of Git versus other distributed version control systems (DVCS) like Mercurial (Hg). There's other sites which can give those flavours if needed.
Once you understand the conceptual differences between CVS/SVN and Git, and then subsequently start to use Git, you may find it very difficult to go back. You should only really start to experiment if you think you're going to migrate in the near future, because using Git is like watching TV in colour; once you've discovered it, it's really difficult to go back to black & white.
- ☞ Once you start to use a DVCS, it's very difficult to want to go back
Centralised version control systems
So, what do you need to know about Git? Well, both CVS and SVN are known as centralised version control systems (CVCS). That is, there is one Master repository which people share code at; everyone checks out their code (or branch) from that repository, and checks changes back in. For code that needs to be sent person-to-person (for example, for review, or as a way of contributing fixes), it is possible to create a patch, which is a diff of your code against the given Master repository version (often HEAD, but sometimes a branch like Eclipse_35).
There are two problems that surface with a centralised version control system; though those problems aren't immediately apparent or obvious.
- You need to be 'on-line' to perform actions, like diff or patch*
- Patches generated against a particular branch can become outdated fairly quickly as development of the snapshot-in-time branch moves on (e.g. when it comes to apply, HEAD is different to before)
The first one is rarely apparent for those working with Eclipse in a location at (or near to) the repository itself. Those in the same continent will rarely experience delays due to global networking variance; in addition, they tend to be employed in an organisation and sat at a desktop connected to wired networking for most of the day. Road warriors (those with laptops and who code from the local coffee shop) tend to operate in a more frequently disconnected mode, which limits repository functionality to when they are connected. (*A quick note here on SVN; since SVN keeps the last-known-checkout, it's possible to do a limited set of operations whilst disconnected from SVN, like diff from the last-known-checkout. However, in general, you are prevented from doing many of the operations that are possible whilst connected.)
The second one is simply an artefact of the way in which patches work. These are generally performed against HEAD (a snapshot in time) and then applied later (sometimes, months or even eight years later). Although they record the version of the file they were patched against, the patch itself is sensitive to big changes in the file, sometimes leading to the patch being inapplicable. Even relatively simple operations, like a file-rename, can throw a well-formed CVCS patch out of the window.
Distributed Version Control Systems
Distributed Version Control Systems (DVCS) are a different family of version control systems to those that most are familiar with. The two most popular are arguably Git and Hg, although many others (Darcs, Bazaar, Bitkeeper etc.) exist. Unlike centralised version control systems (where every individual checks into/out of a shared system), a distributed version control system shares out the data across each participant. Unlike Bittorrent, where the contents are scattered across various machines, in a DVCS each user has a full copy of the repository.
- ☞ Each user has a full copy of the repository
This initially sounds impossible, especially if you're used to centralised version control systems, and even more so if they involve pessimistic file-based locking. (If you do firmly want pessimistic locking, please stop reading here. Thanks.) Questions arise, like:
- If everyone has a copy of the repository, don't all the forks diverge?
- Where is the master repository kept?
- Isn't the repository, like, really big?
- No really, I like pessimistic locking.
Let's answer each one of these questions in turn. (If I missed your favourite question, then please feel free to add one in the comments.)
- Yes, the forks can diverge. But after all, open-source can diverge anyway. There's nothing stopping me from forking the
dev.eclipse.orgcodebase, and publishing my own version of it called Maclipse. The key thing here is that whilst forks are possible, forking is not a bad thing in itself. After all, look at Linux and Android; originally, they shared a history, but are now different. XFree86 and X.Org split over licensing issues. MySQL was forked to create MariaDB, and so on.The key thing about forks is that the best survive. X.Org is now the default X client, whereas XFree86 was the default beforehand. The jury is still out on MySQL versus MariaDB. And although Maclipse has been downloaded literally tens of times, it hasn't caused a dent in Eclipse's growth.
- ☞ Fork happens
- Do not try to bend the master repository – that's impossible. Instead, only try to realise the truth; there is no master repository.If fact, there's a veritable matrix of master repositories possible. Each repository can be considered a node in a graph; nodes in the graph can be connected to each other in any way. However, rather than an n-n set of links, the graph usually self-organises into a tree-like structure, logically associating with one point that acts as a funnel for everything else. In a sense, that's a master repository – everyone has already made the choice; now you have to understand it. Should an oracle intervene, a neo-master can be chosen.
- ☞ There is no master repository
- Having accepted that there is no master repository, it becomes clear that the repository must live in its entirety on each of the nodes in the DVCS. This usually leads to fears about the size of the repository, even taking into account the fact that storage is cheap.A key point here is that DVCS repositories are usually far smaller than their counterpart CVCS repositories, not least of which is because everyone has to have a full repository in order to do any work. It's a natural consequence that they're smaller.However, they're also smaller because each repository contains far less scope than a CVCS repository. For example, most organisations will have one mammoth CVCS repository with several thousand top-level 'modules' (or 'projects') underneath. Because of the administrative overhead with 'creating a new repository', it is often easier to reuse the same one for everything. (SVN put some limits on how wide it could grow, which CVS tended not to have; but even so, the main Apache SVN is over 900k revisions.)By contrast, setting up a DVCS is usually nothing more than a directory with a few administrative files inside. It doesn't require administrator privileges or specific ports; in fact, since there's no central server to speak of, it doesn't even need to be shared by network protocols.As a result, a DVCS repository is much more granular – and easy to create – than a traditional CVCS repository. Firstly, it's always on your machine (there's no centralised server to configure) and secondly, all you need access to is a file system. So typically, a DVCS “repository” will often be at the level of an Eclipse project or project working set. For example, although the CVS RT repository is shared by Equinox and ECF, a DVCS-based solution would almost certainly see the Equinox and ECF projects in their own repositories; perhaps, even breaking down further into (say) ECF-Doc and ECF-Bundles. Think of a DVCS repository as one or a few Eclipse projects instead of hundreds of projects together.
- ☞ DVCS repositories are much smaller, typically because they only contain a small number of highly-related projects
- That's not a question. Look, if you want the benefits of a centralised DVCS with pessimistic locking and pessimistic users, then go look at ClearCase.
- ☞ Friends don't let friends use ClearCase
How does it work?
There are two pieces of information that identify elements in a CVCS; a file's name, and its version (sometimes called revision). In the case of CVS, each file has its own version stream (1.1, 1.2, 1.3), whilst in SVN, each changeset has a 'repository revision' number. Tags (or branches) are symbolic identifiers which may be attached to any specific set of files or repository revision, and are mostly for human consumption (e.g. HEAD, trunk, ECLIPSE_35).
This doesn't work in a DVCS. Because there is no central repository, there is no central repository version number (either for the repository as a whole, or for individual files).
Instead, a DVCS operates at the level of a changeset. Logically, a repository is made up from an initial (empty) state, followed by many changesets. (A changeset is merely a change to a set of files; if you think 'patch' from CVS or SVN, then you're not far off.)
Identifying a changeset is much harder. We can't use a (global) revision number, because that concept isn't used. Instead, a changeset is represented as a hash of its contents. For example, given the changeset:
--- a/README.txt +++ b/README.txt @@ -1 +1 @@ -SVN is great +Git is great
then we can create a 'hash' using (for example)
md5, to generate the string
0878a8189e6a3ae1ded86d9e9c7cbe3f. When referring to our change with others, we can use this hash to identify the change in question.
- ☞ Changesets are identified by a hash of their contents
Clearly, though, this doesn't work on its own. What happens if we do the same change later on? It would have the same change, and so we don't want the same hash value.
What happens is that a changeset contains two things; the change itself, and a back-pointer to the previous changeset. In other words, we end up with something like:
previous: 48b2179994d494485b79504e8b5a6b23ce24a026 --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -SVN is great +Git is great
- ☞ Changesets (recursively) contain pointers to the previous changeset
Now, if we were to have the same change again, the previous value would be different, so we'd get a different hash value. We could set up an argument:
previous: 48b2179994d494485b79504e8b5a6b23ce24a026 --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -SVN is great +Git is great previous: 8cafc7ecd01d86977d2af254fc400cee --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -Git is great +SVN is great previous: cba3ef5b2d1101c2ac44846dc4cdc6f4 --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -Git is great +SVN is great
Each time, the value of the changeset includes a pointer to what comes before, so the hash is continually changing.
Note: Rather than using
md5, as shown here, most DVCS (including Git) use an
sha1 hash instead. Also, the exact way that the prior elements in the tree are stored, and their relationships, isn't accurately portrayed above; however, it gives the idea of how they are organised sufficiently well.
- ☞ Git changesets are identified by an SHA-1 hash
Changesets and branches
Given that a changeset is a long value like
48b2179994d494485b79504e8b5a6b23ce24a026, it can be unfriendly to use. Fortunately, there are a couple of ways around this. Git, like other DVCSs, allow you to use an abbreviated form of the changeset, providing that it's unique in the repository. For small repositories, this means that you can refer to changesets by really short values, like
48b21 or even
48. Conventionally, developers often use 6 digits of the hash – but large projects (like the Linux kernel) tend to have to use slightly larger references in order to have uniqueness.
- ☞ Git hashes can be shortened to any unique prefix
The current version of your repository is simply a pointer to the end of the tree. For this reason, it's often referred to as a tip, but
HEAD is used the symbolic identifier for what the current repository is pointing to. Similarly, any branch can be referred to by its changeset id, which includes that and all prior changes. The default branch is usually called master.
- ☞ The default 'trunk' is called 'master' in Git
- ☞ The tip of the current branch is referred to as 'HEAD'
As a direct corollary from this, creating branches in a DVCS is fast. All that happens is the repository on disk is updated to point to a different element in the (already physically present) tree, and you're good to go. Furthermore, it's trivial to ping-pong between different branches on the same repository, which can contain different states and evolve independently.
- ☞ Creating, and switching between, branches is fast
Because branching is so fast, branches get used for things where a user of a CVCS wouldn't normally use branching. For example, each bug in Bugzilla could have a new branch associated with it; if a couple of independent features are being worked on concurrently, they'd get their own branch; if you needed to drop back to do maintenance work on an ECLIPSE_35 branch, then you'd switch to a branch for that as well. Branches get created at least as frequently as changesets might in CVS, if not more so.
- ☞ Create a new branch for each Bugzilla or feature item that you work on
- ☞ Think of branches as throwaway changesets
With great power comes great flexibility, but ultimately, you want to get your changes into some kind of merged stream (like HEAD). One of the fears of unconstrained branching is that of unconstrained merge pains later on. SVN makes this slightly less difficult than CVS, but unless you merge to HEAD frequently, you can easily get lost – particularly when refactorings start happening.
- ☞ It's painful to merge in a CVCS; therefore branches tend not to happen
Fortunately, DVCSs are all about merging. Given that each node in the changeset tree contains a pointer to its previous node (and transitively, to the beginning of time), it's much more powerful than the standard flat CVCS diff. In other words, not only do you know what changes need to be made, but also what point in history they need to be made. So, if you have a changeset which renames a file, and then merge in a changeset which points to the file as it was before it was renamed, then a CVCS will just fall over; but a DVCS will be able to apply the change before the rename occurred, and then play forward the changes.
Merges are just the weaving together of two (or more) local branches into one. The git merge documentation has some graphical examples of this; but basically, it's just like any other merge you've seen. However, unlike CVCS, you don't have to specify anything about where you're merging from and to; the trees automatically know what their split point was in the past, and can work it out from there.
- ☞ Merging is a DVCS like Git is trivial
Pulling and pushing
So far, we've not talked much about the distributed nature of DVCS. Implicitly, though, the changes and ideas above are all to support distribution.
Given that a DVCS tree is merely a pointer to a branch (which transitively contains a long list of previous branches), and that each one of these nodes is identified by its hash, then you and I can share the same revision identifiers for common parts of our tree. There's three cases to consider for comparing our two trees:
- Your tip is an ancestor of my tip
- My tip is an ancestor of your tip
- Neither of our tips are direct ancestors; however, we both share a common ancestor
The first two cases are trivial; if we synchronise trees, they just become a fast-forward merge. In fact, if that occurs, chances are you won't know who is ahead of the other; it will just happen.
The last case is only slightly more tricky; a common ancestor must be found; say,
746d6c. Then I send changes between my tip and
746d6c, and you send changes between your tip and
746d6c. That way, we both end up with the same contents on our repositories.
Changes flow between repositories by push and pull operations. In essence, it doesn't matter whether I push my changes to you, or you pull my changes from me; the net result is the same. However, in the case of Eclipse.org infrastructure, it's likely that a central Git repository will only be writable by Eclipse committers. Thus, if I contribute a fix, I can ask a committer to pull the fix from my repository, and then they (after reviewing, and optionally rebasing) can push the fix to the Eclipse.org repository.
The best part of a DVCS is that it takes care of all the paperwork for you. You don't need to use SVN-like
314:321 tags to remind you where you branched from; you don't even have to worry if you haven't updated recently. It all just works.
- ☞ Pulling and pushing in a DVCS like Git is trivial
Cloning and remotes
Where you can push (or pull) to is configured on a per (local) repository basis. Typically, if you clone an existing project, then a remote name called origin is automatically set up for you. For example, if you wanted to get hold of org.eclipse.babel.server.git, then you could do:
We can then keep up-to-date with what's happening on the remote server by executing a pull from the remote:
git pull origin
...but we're not limited to one repository. Let's say we wanted to create a separate copy on GitHub for easy forking; we can do that by adding another remote Git URL and then pushing to that:
git remote add github http://github.com/alblue/babel.git git push github
We can now use
git push and
git pull to move items between the two git repositories. By default, they both refer to the special-named origin, but you can specify whatever remote to talk to on the command line.
- ☞ Origin is the name of the default remote, but you can have many remotes per repository.
Initialising, committing and branching
To create a new Git repository, the
git init command is used. This creates an empty repository in the current directory. They can, but often don't, end with
.git – typically it's only repositories pushed to remote servers that use the
.git extension. As noted above, a Git repository should ideally only hold one or a few highly related/coupled projects.
- ☞ 'git init' creates a fresh repository in the current directory
Git allows you to commit files, much like any other VCS. Each commit may be a single file, or many files; and a message goes along with it. Unlike other VCS, Git has a separate concept of an index, which is a set of files that would be committed. You can think of it as an active changeset; as you're working on multiple files, you only want some changes to be committed as a unit. These files get
git added to the index first, then
git committed subsequently. (If you don't like this behaviour, there's a
git commit -a option, which performs like CVS or SVN would.)
- ☞ 'git add' is used to add files and track changes to files
- ☞ 'git commit' is used to commit tracked files
To create branches, you can use
git branch (which creates, but does not switch to, the new branch) and
git checkout (which switches to the new branch). A shorthand for new branches is
git checkout -b, which creates-and-switches to a branch. At any point,
git branch shows you a list of branches and marks the current one with a * next to the name.
- ☞ 'git branch' is used to create and list branches
- ☞ 'git checkout' is used to switch branches
- ☞ 'git checkout -b' is used to create and then switch branches
Here's a transcript of working with setting up an initial repository, then copying data to and from a 'remote' repository, albeit in a different directory on the same system. The instructions are for a Unix-like environment (e.g. Cygwin on Windows).
$ mkdir /tmp/example $ cd /tmp/example $ git init Initialized empty Git repository in /tmp/example/.git/ $ echo "Hello, world" > README.txt $ git commit # Won't commit files by default # On branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # README.txt nothing added to commit but untracked files present (use "git add" to track) $ git add README.txt # Similar to Team -> Add to Version Control $ # git commit # Would prompt for message $ git commit -m "Added README.txt" [master (root-commit) 0dd1f35] Added README.txt 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 README.txt $ echo "Hello, solar system" > README.txt $ git commit # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.txt # no changes added to commit (use "git add" and/or "git commit -a") $ git commit -a -m "Updated README.txt" [master 9b1939a] Updated README.txt 1 files changed, 1 insertions(+), 1 deletions(-) $ git log --graph --oneline # Shows graph nodes (not much here) and change info * 9b1939a Updated README.txt * 0dd1f35 Added README.txt $ git checkout -b french 0dd1f35 # create and switch to a new branch 'french' Switched to a new branch 'french' $ cat README.txt Hello, world $ echo "Bonjour, tout le monde" > README.txt $ git add README.txt # or commit -a $ git commit -m "Ajouté README.txt" [french 66a644c] Ajouté README.txt 1 files changed, 1 insertions(+), 1 deletions(-) $ git log --graph --oneline * 66a644c Ajouté README.txt * 0dd1f35 Added README.txt $ git checkout -b web 0dd1f35 # Create and checkout a branch 'web' from initial commit $ echo '<a href="http://git.eclipse.org">git.eclipse.org</a>' > index.html $ git add index.html $ git commit -m "Added homepage" [web d47e30c] Added homepage 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 index.html $ git checkout master $ git branch # See what branches we've got french * master web $ git merge web # pull 'web' into current branch 'master' Merge made by recursive. index.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 index.html $ git checkout french # Switch to 'french' branch Switched to branch 'french' $ git merge web # And merge in the same Merge made by recursive. index.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 index.html $ git log --graph --oneline * e974231 Merge branch 'web' into french |\ | * d47e30c Added homepage * | 66a644c Ajouté README.txt |/ * 0dd1f35 Added README.txt $ git checkout master $ git log --graph --oneline * e3de4de Merge branch 'web' |\ | * d47e30c Added homepage * | 9b1939a Updated README.txt |/ * 0dd1f35 Added README.txt $ (mkdir /tmp/other;cd /tmp/other;git init) # Could do this in other process Initialized empty Git repository in /tmp/other/.git/ $ git remote add other /tmp/other # could be a URL over http/git $ git push other master # push branch 'master' to remote repository 'other' Counting objects: 11, done. Delta compression using up to 2 threads. Compressing objects: 100% (7/7), done. Writing objects: 100% (11/11), 981 bytes, done. Total 11 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (11/11), done. To /tmp/other * [new branch] master -> master $ git push --all other # Push all branches to 'other' Counting objects: 8, done. Delta compression using up to 2 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (5/5), 567 bytes, done. Total 5 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (5/5), done. To /tmp/other * [new branch] french -> french * [new branch] web -> web $ cd /tmp/other # Switch to 'other' repository $ ls # Nothing to be seen, but it's there $ git branch french * master web $ git checkout web # Get the contents of the 'web' branch in other $ ls README.txt index.html $ echo '<h1>Git rocks!</h1>' >> index.html $ git commit -a -m "Added Git Rocks!" [web 510621a] Added Git Rocks 1 files changed, 1 insertions(+), 0 deletions(-) $ cd /tmp/example # Back to first repo $ git pull other web # Pull changes from 'other' repo 'web' branch remote: Counting objects: 5, done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /tmp/other * branch web -> FETCH_HEAD Merge made by recursive. index.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ git log --graph --oneline * 146932f Merge branch 'web' of /tmp/other |\ | * 510621a Added Git Rocks * | e3de4de Merge branch 'web' |\ \ | |/ | * d47e30c Added homepage * | 9b1939a Updated README.txt |/ * 0dd1f35 Added README.txt
Rebasing and fast-forwarding
Often, you'll work on a branch for a while and then want to commit it to the repository. You can do this at any point, but it's considered good practice to rebase your local branch before doing so. For example, you can end up with multiple branches in the log (with
git log --graph --oneline):
* f0fde4e Merge change I11dc6200 |\ | * 86dfb92 Mark the next version as 0.6 * | 0c8c04d Merge change I908e4c77 |\ \ | |/ |/| | * 843dc8f Add support for logAllRefUpdates configuration parameter * | 74ba6fc Remove TODO file and move to bugzilla * | ba7c6e8 Fix SUBMITTING_PATCHES to follow the Eclipse IP process * | c5e8589 Fix tabs-to-spaces in SUBMITTING_PATCHES * | 677ca7b Update SUBMITTING_PATCHES to point to Contributor Guide * | 8847865 Document protected members of RevObjectList * | a0a0ce8 Make it possible to clear a PlotCommitList * | 4a3870f Include description for missing bundle prereqs |/ * 144b16d Cleanup MANIFEST.MF in JGit
What happened here was that two branches split off from change
144b16d, ultimately driving another branch at
74ba6fc and a few merges (at
f0fde4e). (You can see a similar effect in Google Code's Hg view of Wave Protocol.) Ultimately, whilst the DVCS can handle these long-running branches and subsequent merges, humans tend to prefer to see fewer branches in the final repository.
A fast-forward merge (in Git terms) is one which doesn't need any kind of merge operation. This usually happens when you are moving from an older branch to a newer branch on the same timeline; such as when updating to a newer version from a remote repository. These are essentially just moving the HEAD pointer further down the branch.
A rebase is uprooting the branch from the original commit, and re-writing history as if it had been done from the current point in time. For example, in the above Git trace,
0c8c0fd was only one commit off the main tree. Had the change been rebased off of
74ba6fc, then we would have only seen a single timeline across those commits. It's generally considered good practice to rebase changes prior to pushing to a remote tree to avoid these kind of fan-outs, but it's not necessary to do so. Furthermore, the rebase operation changes the
sha1 hashes of your tree, which can affect those who have forked your repository. Best practice is to frequently rebase your changes in your own local repository, but once they've been made public (by pushing to a shared repository) to avoid rebasing further.
- ☞ Rebasing replants your tree; but do it on local branches only