Fix parse_git_branch

Formerly parse_git_branch was using "git describe", which can report an
incorrect branch name if one branch was branched from another, but no
changes have since been made in either.