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

Re: "git-merge": allow fast-forwarding in a stat-dirty tree

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Aug 20, 2008, 22:35 UTC
Message-ID
<20080820223511.GM23800@genesis.frugalware.org>
In-Reply-To
<7vljyrnxt3.fsf_-_@gitster.siamese.dyndns.org>
On Wed, Aug 20, 2008 at 03:09:28PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
>  	if (read_cache_unmerged())
>  		die("you need to resolve your current index first");
> +	refresh_cache(REFRESH_QUIET);

I did not realise that we need a refresh_cache() after read_cache_unmerged() here, and thus the other refresh_cache() call is unnecessary.

Thanks.
Previous: Junio C Hamano
Message 7 of 7 in “[BUG] pull faulty 'not uptodate'”
  1. Pieter de BieAug 20, 2008
  2. Junio C HamanoAug 20, 2008
  3. Pieter de BieAug 20, 2008
  4. Junio C HamanoAug 20, 2008
  5. Junio C HamanoAug 20, 2008
  6. "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano, Aug 20, 2008
  7. Miklos VajnaAug 20, 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.