On Tue, Mar 01, 2011 at 03:39:10PM -0500, Computer Druid wrote: > > I'll do that, but it will probably take a long long time for me to see > > the patch. ÂI'm hoping there's some cheap hack I can use to work > > around it in the meantime. > > A simple answer to preventing git from calling rmdir would be to run > rm and git rm separately: > $ rm file > $ git rm --cached -f file > > But that doesn't solve the misbehavior of git under the previous > scenario. I'm not sure if this is something we should fix in git or if > it should be fixed in cifs. That will fix some instances. But git will rmdir to clean up anytime it removes content. That includes during a merge or patch application. So you can't really get around those cases. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html