From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Johannes Sixt <johannes.sixt@telecom.at>
Cc: git@vger.kernel.org, j.sixt@eudaptics.com
Subject: Re: [PATCH] Test that git add removes stages 1,2,3.
Date: Mon, 2 Jul 2007 12:34:44 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707021232510.4438@racer.site> (raw)
In-Reply-To: <11833750863127-git-send-email-johannes.sixt@telecom.at>
Hi,
On Mon, 2 Jul 2007, Johannes Sixt wrote:
> git add seems to have a bug, where it doesn't remove stages 1,2,3
> if a stage 0 entry is already in the index.
But how does that happen? I do not know any way to use porcelain to
achieve that bogus state.
AFAIK stages 1,2,3 are only populated when there are conflicts, in which
case there is no stage 0. Literally the only way I see to have both is to
_make_ update-index put them in there.
Pilot error?
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-02 11:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-02 11:18 [PATCH] Test that git add removes stages 1,2,3 Johannes Sixt
2007-07-02 11:23 ` [PATCH/amend] " Johannes Sixt
2007-07-02 11:34 ` Johannes Schindelin [this message]
2007-07-02 11:47 ` [PATCH] " Johannes Sixt
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=Pine.LNX.4.64.0707021232510.4438@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=j.sixt@eudaptics.com \
--cc=johannes.sixt@telecom.at \
/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;
as well as URLs for NNTP newsgroup(s).