Accommodate different formatting in new 'git status -sb' result