compartmentalize git prompt a little more
fix the state part of the git prompt