Don't pass HEAD to git describe with --dirty

The 'git describe' manual explicitly distinguishes --dirty as not
taking a commitish, so don't pass one.  Fixes #2764.
fix review commentsa

+import reorder
Stop doing builds for merged in commits.

Those commits have already been tested by buildbot in the past. Only
the merge itself needs to be tested.