From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Frank Li <lznuaa@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: unmerged flag at git diff-index
Date: Wed, 21 Jan 2009 03:48:01 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.1.00.0901210343510.19014@racer> (raw)
In-Reply-To: <1976ea660901201813r7b03525ax39fd0e1ecfb1700e@mail.gmail.com>
Hi,
On Wed, 21 Jan 2009, Frank Li wrote:
> 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
prev parent reply other threads:[~2009-01-21 2:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 2:13 unmerged flag at git diff-index Frank Li
2009-01-21 2:40 ` Junio C Hamano
2009-01-21 2:48 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.00.0901210343510.19014@racer \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=lznuaa@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox