From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: rebase: strange failures to apply patc 3-way Date: Mon, 11 Mar 2013 21:01:14 -0400 Message-ID: <20130312010114.GA21026@sigill.intra.peff.net> References: <3B5EA38E-9603-4321-AA3C-74354BBC8BFC@quendi.de> <513B8037.7060107@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Andrew Wong , "git@vger.kernel.org" To: Max Horn X-From: git-owner@vger.kernel.org Tue Mar 12 02:01:53 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UFDbE-0005vZ-Td for gcvg-git-2@plane.gmane.org; Tue, 12 Mar 2013 02:01:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754973Ab3CLBBZ (ORCPT ); Mon, 11 Mar 2013 21:01:25 -0400 Received: from 75-15-5-89.uvs.iplsin.sbcglobal.net ([75.15.5.89]:46365 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754951Ab3CLBBR (ORCPT ); Mon, 11 Mar 2013 21:01:17 -0400 Received: (qmail 20880 invoked by uid 107); 12 Mar 2013 01:02:56 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Mon, 11 Mar 2013 21:02:56 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 11 Mar 2013 21:01:14 -0400 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 12, 2013 at 01:29:45AM +0100, Max Horn wrote: > So it seems pretty clear what the cause of this is. Now I still need > to figure out why it affects that particular repository and not > others. But at this point I guess it is safe to say that Apple's > auto-crap-magic revisiond is the root of the problem, and git is > purely a victim. So I'll stop spamming this list with this issue for > now, and see if I can figure out a fix that is less invasive than > turning off revisiond completely (which some application rely on, so > disabling it may break them badly). >>From "git help config": core.trustctime If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See git-update- index(1). True by default. -Peff