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

Re: msysgit: merge, stat

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 13, 2007, 16:45 UTC
Message-ID
<Pine.LNX.4.64.0708131743360.25989@racer.site>
In-Reply-To
<2C573942-DD22-46EC-AE4A-1334450A7C4D@zib.de>
Hi,
On Sun, 12 Aug 2007, Steffen Prohaska wrote:
Show 6 quoted lines
> After a 'git merge' in msysgit some stat information of the index
> doesn't match the working tree. Thus 'git diff' looks at files,
> which it shouldn't look at. I need to do a
> 'git update-index --refresh' before everything's in sync.
> 
> Is this a know issue? Do other experience the same?

Yes, it is. The real issue is that the index is out of date, and the full speed of git is not available until a refresh (which you can have with a "git status", too).

There are people who want to change the behaviour, and hide the empty diff output, preventing the user from ever knowing why git is so slow.

So just run a "git status" and continue.

Ciao, Dscho

Previous: Steffen ProhaskaNext: Steffen Prohaska
Message 2 of 8 in “msysgit: merge, stat”
  1. Steffen ProhaskaAug 12, 2007
  2. Johannes SchindelinAug 13, 2007
  3. Steffen ProhaskaAug 13, 2007
  4. Junio C HamanoAug 13, 2007
  5. Steffen ProhaskaAug 13, 2007
  6. Junio C HamanoAug 13, 2007
  7. Johannes SchindelinAug 14, 2007
  8. Steffen ProhaskaAug 14, 2007

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.