Thomas Rast, Thu, Sep 25, 2008 09:05:02 +0200: > Shawn O. Pearce wrote: > > "Michael P. Soulier" <msoulier@xxxxxxxxxxxxxxxx> 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
