Re: possible bug in git apply?

Junio C Hamano [off-list ref] writes:

Actually that will break the case of removing foo/bar, which is
the only file in directory foo, and creating a new file foo.

Sorry.  The creation codepath already has enough code to remove
the left-over directory foo/ when creating the file foo.  I
think your three-step process should be Ok.