Fix severe breakage in "git-apply --whitespace=fix"