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

msysgit: merge, stat

From
Steffen Prohaska <prohaska@zib.de>
Date
Aug 12, 2007, 21:00 UTC
Message-ID
<2C573942-DD22-46EC-AE4A-1334450A7C4D@zib.de>

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?

You should basically be able to reproduce the behaviour by any merge (maybe non-fast-forward, I'm not sure).

	Steffen
Next: Johannes Schindelin
Message 1 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.