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

Re: Possibly-spurious 'not uptodate. Cannot merge'

From
Nix <nix@esperi.org.uk>
Date
Dec 14, 2008, 23:15 UTC
Message-ID
<87bpve73ic.fsf@hades.wkstn.nix>
In-Reply-To
<7vwse21rh6.fsf@gitster.siamese.dyndns.org>
On 14 Dec 2008, Junio C. Hamano said:
Show 5 quoted lines
> Ancient git, whose "git merge" was a scripted command, refreshed the index
> before starting, but it lost that when the command was rewritten in C soon
> after v1.5.6 by 1c7b76b (Build in merge, 2008-07-07), and nobody noticed
> it until 76c3fb1 (Merge branch 'mv/merge-refresh', 2008-10-09).  In other
> words, the tip of 'master' (and upcoming 1.6.1) already has the fix.
Excellent! I do love this precognitive bugfixing thing.

(It's not as if the update-index workaround is terribly onerous, but it's annoying and not something a git newbie might think of.)

Previous: Junio C HamanoNext: Sitaram Chamarty
Message 3 of 5 in “Possibly-spurious 'not uptodate. Cannot merge'”
  1. NixDec 14, 2008
  2. Junio C HamanoDec 14, 2008
  3. NixDec 14, 2008
  4. Sitaram ChamartyDec 15, 2008
  5. Junio C HamanoDec 15, 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.