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 28, 2008, 15:26 UTC
Message-ID
<200809281726.23062.trast@student.ethz.ch>
In-Reply-To
<20080928151135.GF23137@genesis.frugalware.org>
Miklos Vajna wrote:
> 
> Oh, the racy git problem. ;-)
> 
> $ git reset --hard; touch foo; git merge side

IIUC, this is not the same as "racy git". The racy case is if you manage to get a file changed immediately after its index entry was updated, so that it will look unchanged. In this case, it's simply the same file with a new mtime, which means it looks changed superficially but still has the same contents.

Granted, you could call my test "racy" because it relies on 'make install' taking at least one second, which by Moore's law should happen sometime around 2019 ;-)

> Thanks for the reproducer, I'll write a proper testcase for this and try to
> provide a fix for it as well.
Thanks.
- Thomas
-- 
Thomas Rast
trast@student.ethz.ch
Previous: Miklos VajnaNext: Miklos Vajna
Message 9 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.