Subject: Re: [PATCH 12/13] Build in merge

From: Olivier Marin <[email-masked]>
Date: Fri, 27 Jun 2008 15:04:52 +0200

Miklos Vajna a écrit :
> On Fri, Jun 27, 2008 at 01:03:20PM +0200, Olivier Marin <[email-masked]> wrote:
>> Absolutely. And also color.ui. The following patch should do the trick:
>>
>> diff --git a/builtin-merge.c b/builtin-merge.c
>> index 98adca5..cf557f7 100644
>> --- a/builtin-merge.c
>> +++ b/builtin-merge.c
>> @@ -7,6 +7,7 @@
>>   */
>>  
>>  #include "cache.h"
>> +#include "color.h"
>>  #include "parse-options.h"
>>  #include "builtin.h"
>>  #include "run-command.h"
>> @@ -712,6 +713,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>>         git_config(git_merge_config, NULL);
>>         git_config(git_diff_ui_config, NULL);
>>  
>> +       if (diff_use_color_default == -1)
>> +               diff_use_color_default = git_use_color_default;
>> +
>>         argc = parse_options(argc, argv, builtin_merge_options,
>>                         builtin_merge_usage, 0);
> 
> Have you tried this?

I did. I forget to say that it's on top of your patch, sorry.

> First, you need to call git_get_colorbool_config(), second this won't
> respect diff.color, while my patch does.

git_get_colorbool_config() is called via git_diff_ui_config.

Olivier.