Merge branch 'ps/prompt-parse-HEAD-futureproof'

Futureproof command line prompt support (in contrib/). * ps/prompt-parse-HEAD-futureproof: git-prompt: stop manually parsing HEAD with unknown ref formats