Rewrite gitstatus collection to be more robust (#7322)
Rewrite gitstatus collection to be more robust (#7322)

Fix the finicky parsing logic and just ask git the necessary information
directly.
tekniklr/oh-my-zsh,tekniklr/oh-my-zsh