clean up `git current-branch`
fix up new-branch
play nice with unnamed refs