From: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Date: Thu, 21 Aug 2014 13:49:02 GMT
Subject: Re: [PATCH] Check order when reading index
Message-ID: <CAPuZ2NGfKtc3+JyywNeuEk5Yx_mTAM6QLs1S5p49TWxkUe6_SQ@mail.gmail.com>
In-Reply-To: <1408628606-12975-1-git-send-email-jsorianopastor@gmail.com>

On Thu, Aug 21, 2014 at 3:43 PM, Jaime Soriano Pastor
<jsorianopastor@gmail.com> wrote:
> +               if (!ce_stage(ce))
> +                       die("Multiple stage entries for merged file '%s'",
> +                               ce->name);

This case can be provoked by "git update-index --index-info" as shown
in the patch with the added test, maybe it should be only a warning.
And add too some variation of the patches in this thread to make the
same command able to fix the situation.