From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 17 Aug 2016 06:10:46 GMT
Subject: Re: git-mergetool reverse file ordering
Message-ID: <882f5f1d-19a6-7b4b-7c6a-7347981fee72@kdbg.org>
In-Reply-To: <18a1ef52-1c5b-4f0a-5da2-777e816a1e3e@kdbg.org>

Am 17.08.2016 um 08:05 schrieb Johannes Sixt:
> Am 17.08.2016 um 03:25 schrieb David Aguilar:
>> Hmm, I do like the idea of reusing the diff orderFile, but a
>> mechanism for sorting arbitrary inputs based on the orderFile
>> isn't currently exposed in a way that mergetool could use it.
>
> Instead of using 'git ls-files -u | sed ... | sort -u' you could use
>
>   git diff-files --name-status -O... | sed -ne '/^U/s/^..//p'

Or even better:

     git diff-files --name-only --diff-filter=U -O...

>
>> But, that sort is honestly kinda crude.  It can't implement the
>> interesting case where we want bar.h to sort before bar.c but
>> not foo.h.
>>
>> If we did the sort option, we could have both.
>
> I don't think that we need a new filter when the diff machinery is
> capable of re-ordering files. We should enhance the diff machinery instead.
>
> -- Hannes
>