From: Junio C Hamano Date: Sun, 05 Aug 2007 05:11:19 GMT Subject: Re: possible bug in git apply? Message-ID: <7vvebuh8g8.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > It should. I thought we did that, but maybe there's some bug there. > > See "remove_file()" in builtin-apply.c. > > But yeah, it seems that the file *rename* ends up not triggering that > logic! Very annoying. > > Does this fix it? Totally untested, but it _looks_ obvious enough.. That would regress the fix made in aea19457, I am afraid. If you are in a subdirectory and the rename patch moves away the last file in your current directory, the shell session you ran the git-apply from will end up in an unlinked directory. Maybe that is a pilot error, and we can revert aea19457 altogether?