git-status: make porcelain more robust