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