running git status fewer times
fixed parsing bug