Patch Set 1:

Thanks. Looks like I'm quite good at hitting all those traps, although I'm afraid there are some more.

I actually wanted to create a new patch set for http://egit.eclipse.org/r/#change,2721
I'll read up on gerrit before I mess things up further.