From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 07 Jul 2008 18:15:09 GMT
Subject: Re: [PATCH 14/14] Build in merge
Message-ID: <7vhcb14l3m.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080707171721.GT4729@genesis.frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> I think it's better not to modify all_strategy, it serves as a
> reference, for example later this would allow us to check if the used
> merge strategy is a predefined or a custom one.

I do not get you on this point.  Which one is nicer?

 (1) Have two lists, perhaps all_* and user_*.  The logic that finds a
     strategy searches in two lists.  The logic that checks if a given
     strategy is built-in checks if it is on all_* list.

 (2) Have a single list, but add a boolean "unsigned is_builtin:1" to each
     element of it.  The logic that finds a strategy looks in this single
     list.  The logic that checks if a given strategy is built-in looks at
     the strategy instance and it has the bit already.

You seem to be advocating (1) but I do not understand why...