From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: Git changes permissions on directories when deleting files. Date: Tue, 1 Mar 2011 15:57:02 -0500 Message-ID: <20110301205702.GA21429@sigill.intra.peff.net> References: <20110301194428.GD10082@sigill.intra.peff.net> <20110301200805.GA18587@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Chad Joan , git@vger.kernel.org To: Computer Druid X-From: git-owner@vger.kernel.org Tue Mar 01 21:57:05 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PuWcx-0002gD-R9 for gcvg-git-2@lo.gmane.org; Tue, 01 Mar 2011 21:57:04 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757515Ab1CAU4y convert rfc822-to-quoted-printable (ORCPT ); Tue, 1 Mar 2011 15:56:54 -0500 Received: from xen6.gtisc.gatech.edu ([143.215.130.70]:40732 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757423Ab1CAU4x (ORCPT ); Tue, 1 Mar 2011 15:56:53 -0500 Received: (qmail 10421 invoked by uid 111); 1 Mar 2011 20:56:52 -0000 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net (HELO sigill.intra.peff.net) (99.108.226.0) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.40) with ESMTPA; Tue, 01 Mar 2011 20:56:52 +0000 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 01 Mar 2011 15:57:02 -0500 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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. =C2=A0I'm hoping there's some cheap hack I can use to wo= rk > > around it in the meantime. >=20 > 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 >=20 > 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 i= f > 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