Hello all
If you're pushing multiple changes, please read this. If you're always pushing
one single change, you can ignore it for now.
I've asked sysadmins to change the Gerrit submit configuration to "cherry-
pick". If you have multiple commits with dependencies on one another, you need
to submit each one, all in order. Gerrit will allow you to submit parts of a
branch or even later commits without earlier ones. It's up to you to decide if
that's possible or not.
That is, suppose you have 3 changes in your repository and you push them all:
git push origin HEAD:refs/for/master
That creates 3 changes in Gerrit. They will be linked to each other in
"related changes", but you are allowed to submit them individually and out of
order too. You can no longer submit the latest and expect it to include all
changes.
Up until now, Gerrit would merge your commits into the target branch,
resulting in a lot of merge commits. In our repository, currently 35% of the
commits are merge commits created by Gerrit; in the past month, that was 41%.
Those merge commits do not add anything of value and just make it harder to
follow history. Run gitk or git log --graph to see it.
--
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
