From: Junio C Hamano Date: Mon, 06 Aug 2007 09:37:18 GMT Subject: Re: possible bug in git apply? Message-ID: <7vir7tc8c1.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vabt5dq11.fsf@assigned-by-dhcp.cox.net> Junio C Hamano 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.