From: Jeff King <peff@peff.net>
Date: Tue, 01 Mar 2011 20:57:02 GMT
Subject: Re: Git changes permissions on directories when deleting files.
Message-ID: <20110301205702.GA21429@sigill.intra.peff.net>
In-Reply-To: <AANLkTinkjhH6YR7VPC0hji9CK=qeQMAYr+ptJE3szUyR@mail.gmail.com>

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