From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 19 Dec 2007 14:59:20 GMT
Subject: Re: kha/safe and kha/experimental updated
Message-ID: <b0943d9e0712190659p6c4cb557jae5b21aa68de029d@mail.gmail.com>
In-Reply-To: <20071218052115.GA13422@diana.vm.bytemark.co.uk>

On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote:
>   git://repo.or.cz/stgit/kha.git safe
[...]
>       Ask git about unmerged files

This patch wrongly assumes that there is a stage 2 entry in the index.
Test t1202-push-undo.sh fails because a file is added, differently, in
both master and patch but it doesn't exist in ancestor (no stage 2).
Using stage 3 doesn't fix it either because a patch might remove a
file.

I fixed it by using a set to get the unique names.

-- 
Catalin