Re: rebase: strange failures to apply patc 3-way

From: Jeff King <peff@peff.net>
Date: Mar 12, 2013, 01:01 UTC
Message-ID: <20130312010114.GA21026@sigill.intra.peff.net>
In-Reply-To: <A3AD5861-FE88-4D6E-B10A-B83F68BA6368@quendi.de>

On Tue, Mar 12, 2013 at 01:29:45AM +0100, Max Horn wrote:

Show 8 quoted lines

> 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