properly handle untracked files in git