From: Linus Torvalds Date: Sun, 05 Aug 2007 19:20:48 GMT Subject: Re: possible bug in git apply? Message-ID: In-Reply-To: <853ayxiznp.fsf@lola.goethe.zz> On Sun, 5 Aug 2007, David Kastrup wrote: > > But your proposed three passes won't work with a patch removing > "x/..." and creating "x" in its place, since "x/" gets only removed > in pass 3, and "x" needs to created in pass 2 already. Yes, I was wrong. The current two passes are the right thing to do, and we should just always remove empty directories (and my patch was fine: we can leave them alone if it's a pure "modify file in place", but that's really the only case). Linus