From: Alex Riesen <raa.lkml@gmail.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Miklos Vajna <vmiklos@frugalware.org>,
"Michael P. Soulier" <msoulier@digitaltorque.ca>,
git@vger.kernel.org
Subject: Re: having to pull twice
Date: Thu, 25 Sep 2008 20:49:42 +0200 [thread overview]
Message-ID: <20080925184942.GA3959@blimp.localhost> (raw)
In-Reply-To: <200809250905.09646.trast@student.ethz.ch>
Thomas Rast, Thu, Sep 25, 2008 09:05:02 +0200:
> Shawn O. Pearce wrote:
> > "Michael P. Soulier" <msoulier@digitaltorque.ca> wrote:
> > > I'm finding this happening from time to time.
> > >
> > > soulierm@espresso:~/work/mitel-msl-tug$ git pull
> > ...
> > > error: Entry 'mitel-msl-tug.spec' not uptodate. Cannot merge.
> [fixed by 'git status's index refresh]
> >
> > Time or dev/ino skew in the index file vs. what we read from stat.
> >
> > Running git-status rematched the index file to the working directory,
> > and during that rematch it noticed the file wasn't actually modified.
>
> This keeps coming up every week or so... maybe git-merge should
> attempt to refresh the index automatically? Of course it's an
> expensive operation, but if you really want to do the merge you have
> to bite that bullet anyway.
Maybe set "core.trustctime" for this repo to false?
next prev parent reply other threads:[~2008-09-25 18:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 0:58 having to pull twice Michael P. Soulier
2008-09-25 1:01 ` Shawn O. Pearce
2008-09-25 7:05 ` Thomas Rast
2008-09-25 18:49 ` Alex Riesen [this message]
2008-09-25 21:28 ` Michael P. Soulier
2008-09-25 23:25 ` Miklos Vajna
2008-09-27 14:16 ` Thomas Rast
2008-09-28 15:11 ` Miklos Vajna
2008-09-28 15:26 ` Thomas Rast
2008-09-29 15:00 ` Miklos Vajna
2008-10-03 13:02 ` [PATCH] builtin-merge: refresh the index before calling a strategy Miklos Vajna
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=20080925184942.GA3959@blimp.localhost \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=msoulier@digitaltorque.ca \
--cc=spearce@spearce.org \
--cc=trast@student.ethz.ch \
--cc=vmiklos@frugalware.org \
/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).