From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Mar 2012 21:58:30 GMT
Subject: Re: [PATCH] add -p: skip conflicted paths
Message-ID: <7vaa30tmk9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7viphotng8.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> I was hoping that we could somehow do this with a single invocation of
> ls-files, instead of doing it over and over inside a loop.
>
> Totally untested, but something along this line...

Well, probably along that line but not there.  I think the patch would be
a lot cleaner to keep the part I touched intact, and instead add an extra
"ls-files -u" that creates %unmerged hash in the way this patch does,
immediately before the last for() loop in the function.  And then the loop
can use %unmerged hash to filter the elements.