Re: [PATCH] Split out merge_recursive() to merge-recursive.c

On Tue, Aug 12, 2008 at 07:56:29PM +0200, Stephan Beyer [off-list ref] wrote:

quoted

+extern int merge_recursive_verbosity;

Why this?

So we have:
 1. "merge.verbosity" config value
 2. GIT_MERGE_VERBOSITY environment
 3. merge_recursive_verbosity variable

I wonder if 3 is really necessary.

Yes, IMHO it is. The idea is that a

git_config(merge_recursive_config, NULL);
merge_recursive_setup(0);

will take merge.verbosity and GIT_MERGE_VERBOSITY into account, finally
you can always read merge_recursive_verbosity, and you don't have to
deal with the details (if it is set based on GIT_MERGE_VERBOSITY or
based on merge.verbosity).