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

Re: git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Feb 27, 2009, 15:28 UTC
Message-ID
<49A806AE.7010402@viscovery.net>
In-Reply-To
<1976ea660902270653p3b144231h86b98244173d09@mail.gmail.com>
Frank Li schrieb:
Show 7 quoted lines
> $ git ls-files -u
> 100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1       rb1.txt
> 100644 e776c70dbc6ea929021515cf4d45a207a2f56517  3       rb1.txt
> 
> 
> but use git.exe diff-index  --cached --raw HEAD
> show nothing.

That's correct, AFAICS. You have a delete/modify conflict. You deleted rb1.txt locally, yet the branch that you merged in modified it.

HEAD does not have the file, nor is it in the index in stage 0 nor stage 2 ("ours"). There is nothing to compare.

-- Hannes
Previous: Frank Li
Message 2 of 2 in “git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.”
  1. Frank LiFeb 27, 2009
  2. Johannes SixtFeb 27, 2009

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.