Re: rebase: strange failures to apply patc 3-way
- From
Heiko Voigt <hvoigt@hvoigt.net>
- Date
- Mar 12, 2013, 08:26 UTC
- Message-ID
- <20130312082650.GA4075@sandbox-ub.fritz.box>
- In-Reply-To
- <20130312011004.GA21242@sigill.intra.peff.net>
On Mon, Mar 11, 2013 at 09:10:04PM -0400, Jeff King wrote:
Show 19 quoted lines
> On Mon, Mar 11, 2013 at 09:03:42PM -0400, Andrew Wong wrote: > > > On 03/11/13 21:01, Jeff King wrote: > > > 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. > > > > In an earlier email, Max did mention setting the config does workaround > > the issue. But it's still strange that it only happens to a few specific > > files in this particular repo. The issue never popped up in other repos > > that he has, which I assume has all been excluded from Time Machine... > > Ah, sorry, I missed the earlier reference to it. trustctime is the only > sensible thing to do from the git side. I think figuring out the rest is > deep Apple magic that I'm not qualified to comment on.
>From what I read isn't the ctime the only thing that changes? I read
that you tried this option and the issues disappeared? Maybe the resolution (or part of it) is to change the default of core.trustctime to false on osx?
Cheers Heiko