Re: unmerged flag at git diff-index

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 21, 2009, 02:48 UTC
Message-ID: <alpine.DEB.1.00.0901210343510.19014@racer>
In-Reply-To: <1976ea660901201813r7b03525ax39fd0e1ecfb1700e@mail.gmail.com>

Hi,

On Wed, 21 Jan 2009, Frank Li wrote:

Show 14 quoted lines

> There are conflict when I call git merge
> git ls-files -u
> 100644 54d05e1c40c686027b611b702e014284e9ab9a31 1       a.c
> 100644 a8a1b77c0d92f33491a0a69a8645f02ececb1eb6 2       a.c
> 100644 642ba972b2234f63048abcca544b3926f94e04ee 3       a.c
> 
> but when use git diff-index HEAD
> :100644 100644 a8a1b77c0d92f33491a0a69a8645f02ececb1eb6 0000000000000000000000
> 0000000000000000 M      a.c
> 
> a.c flag is M: Modification of the contents or mode of a file.
> 
> I think it should be U: file is unmerged(you must complete the merge
> before it can be commited)

You're talking plumbing here. And diff-index is about the differences between the working directory and the index _stage 0_.

I don't think that's a bug (what would you display? stage 1? stage 2? stage 3?), but even if it weren't, it is plumbing, and plumbing's UI is guaranteed to be stable.

So I guess that you really have to use "git ls-files --stage" at some stage :-)

Ciao, Dscho