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

Frank Li· Feb 27, 2009, 14:53 UTC · lore

$ 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.

Johannes Sixt· Feb 27, 2009, 15:28 UTC · re: Frank Li · lore

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

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