From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 02 Jul 2007 11:34:44 GMT
Subject: Re: [PATCH] Test that git add removes stages 1,2,3.
Message-ID: <Pine.LNX.4.64.0707021232510.4438@racer.site>
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