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

Re: having to pull twice

From
Thomas Rast <trast@student.ethz.ch>
Date
Sep 25, 2008, 07:05 UTC
Message-ID
<200809250905.09646.trast@student.ethz.ch>
In-Reply-To
<20080925010150.GI3669@spearce.org>
Shawn O. Pearce wrote:
Show 6 quoted lines
> "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]
Show 5 quoted lines
> 
> 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.

Unfortunately I can't see an obvious place to do that---the above message comes from unpack-trees.c, where changes would also affect e.g. checkout.

On the other hand, as near as I can tell this is a regression in builtin-merge. Miklos, do you know if/how this can be fixed?

- Thomas
-- 
Thomas Rast
trast@student.ethz.ch
Previous: Shawn O. PearceNext: Alex Riesen
Message 3 of 11 in “having to pull twice”
  1. Michael P. SoulierSep 25, 2008
  2. Shawn O. PearceSep 25, 2008
  3. Thomas RastSep 25, 2008
  4. Alex RiesenSep 25, 2008
  5. Michael P. SoulierSep 25, 2008
  6. Miklos VajnaSep 25, 2008
  7. Thomas RastSep 27, 2008
  8. Miklos VajnaSep 28, 2008
  9. Thomas RastSep 28, 2008
  10. Miklos VajnaSep 29, 2008
  11. builtin-merge: refresh the index before calling a strategyMiklos Vajna, Oct 3, 2008

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.