From: Jeff King <peff@peff.net>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: Max Horn <max@quendi.de>, "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: rebase: strange failures to apply patc 3-way
Date: Mon, 11 Mar 2013 21:10:04 -0400 [thread overview]
Message-ID: <20130312011004.GA21242@sigill.intra.peff.net> (raw)
In-Reply-To: <513E7EEE.3060107@gmail.com>
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.
-Peff
next prev parent reply other threads:[~2013-03-12 1:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 10:16 rebase: strange failures to apply patc 3-way Max Horn
2013-03-08 11:34 ` Max Horn
2013-03-08 15:32 ` Andrew Wong
2013-03-08 17:35 ` Max Horn
2013-03-08 18:02 ` Andrew Wong
2013-03-08 18:47 ` Max Horn
2013-03-08 19:20 ` Andrew Wong
2013-03-09 11:26 ` Max Horn
2013-03-09 18:32 ` Andrew Wong
2013-03-09 18:50 ` Andrew Wong
2013-03-10 13:22 ` Max Horn
2013-03-11 19:15 ` Andrew Wong
2013-03-11 21:10 ` Max Horn
2013-03-11 21:34 ` Andrew Wong
2013-03-11 22:20 ` Max Horn
2013-03-11 21:20 ` Max Horn
2013-03-11 22:10 ` Andrew Wong
2013-03-11 22:36 ` Max Horn
2013-03-11 22:54 ` Andrew Wong
2013-03-12 0:15 ` Max Horn
2013-03-12 0:29 ` Max Horn
2013-03-12 0:41 ` John Szakmeister
2013-03-12 0:58 ` Andrew Wong
2013-03-12 1:01 ` Jeff King
2013-03-12 1:03 ` Andrew Wong
2013-03-12 1:10 ` Jeff King [this message]
2013-03-12 8:26 ` Heiko Voigt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130312011004.GA21242@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=max@quendi.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).