More corrections to the parsing of git status --porcelain