It might be good to rename either git FileStatus or scm FileStatus to help differentiate them. Not necessary in this CL -