From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 09 Feb 2026 16:13:56 GMT
Subject: Re: [PATCH v2] merge-file: honor merge.conflictStyle outside of a repository
Message-ID: <xmqq1pit7v3v.fsf@gitster.g>
In-Reply-To: <aYmkCLbhZPPjKqNK@pks.im>

Patrick Steinhardt <ps@pks.im> writes:

> On Sat, Feb 07, 2026 at 10:37:48PM +0100, Yannik Tausch wrote:
>> diff --git a/builtin/merge-file.c b/builtin/merge-file.c
>> index 46775d0c79..f9de636884 100644
>> --- a/builtin/merge-file.c
>> +++ b/builtin/merge-file.c
>> @@ -95,12 +95,10 @@ int cmd_merge_file(int argc,
>>  	xmp.style = 0;
>>  	xmp.favor = 0;
>>  
>> -	if (startup_info->have_repository) {
>> -		/* Read the configuration file */
>> -		repo_config(the_repository, git_xmerge_config, NULL);
>> -		if (0 <= git_xmerge_style)
>> -			xmp.style = git_xmerge_style;
>> -	}
>> +	/* Read the configuration file */
>> +	repo_config(repo, git_xmerge_config, NULL);
>> +	if (0 <= git_xmerge_style)
>> +		xmp.style = git_xmerge_style;
>>  
>>  	argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
>>  	if (argc != 3)
>
> Makes sense. I was briefly wondering about error handling in the old/new
> code, but unknown keys are already handled by `git_xmerge_config()`, and
> we'd die in case we see one.
>
> So this patch looks good to me overall, thanks!
>
> Patrick

Yeah, looking good.  Thanks, both of you.