git-apply: safety fixes