git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Mar 12, 2013, 01:10 UTC
Message-ID
<20130312011004.GA21242@sigill.intra.peff.net>
In-Reply-To
<513E7EEE.3060107@gmail.com>
On Mon, Mar 11, 2013 at 09:03:42PM -0400, Andrew Wong wrote:
Show 13 quoted lines
> 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.

-Peff
Previous: Andrew WongNext: Heiko Voigt
Message 26 of 27 in “rebase: strange failures to apply patc 3-way”
  1. Max HornMar 7, 2013
  2. Max HornMar 8, 2013
  3. Andrew WongMar 8, 2013
  4. Max HornMar 8, 2013
  5. Andrew WongMar 8, 2013
  6. Max HornMar 8, 2013
  7. Andrew WongMar 8, 2013
  8. Max HornMar 9, 2013
  9. Andrew WongMar 9, 2013
  10. Andrew WongMar 9, 2013
  11. Max HornMar 10, 2013
  12. Andrew WongMar 11, 2013
  13. Max HornMar 11, 2013
  14. Andrew WongMar 11, 2013
  15. Max HornMar 11, 2013
  16. Max HornMar 11, 2013
  17. Andrew WongMar 11, 2013
  18. Max HornMar 11, 2013
  19. Andrew WongMar 11, 2013
  20. Max HornMar 12, 2013
  21. Max HornMar 12, 2013
  22. John SzakmeisterMar 12, 2013
  23. Andrew WongMar 12, 2013
  24. Jeff KingMar 12, 2013
  25. Andrew WongMar 12, 2013
  26. Jeff KingMar 12, 2013
  27. Heiko VoigtMar 12, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.