Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
> I think that would be worthwhile, the warning is potentially confusing
> though if a bad value is followed by a good value then we will warn
> about the bad value but use the good one.
I dunno. That is exactly why the new message is crafted to convey:
"you have an entry with an unsupported value in your configuration
file, which you may want to inspect and possibly correct it; in the
meantime we've ignored that entry". "ignored" is the key word.
If we say "we later found this good value so we'd use it", it may
become confusing, as we'd never issue such a notice for a
last-one-wins variable that do not use any unsupported values, but
we are not doing that, so I think there is no room for confusion.
>> Completely untested. The first test that would be interesting to
>> run is how many tests this changes breaks to gauge how good test
>> coverage we have ;-)
>> xdiff-interface.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> diff --git c/xdiff-interface.c w/xdiff-interface.c
>> index 2e3a5a2943..523b04960a 100644
>> --- c/xdiff-interface.c
>> +++ w/xdiff-interface.c
>> @@ -322,8 +322,8 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
>> * git-completion.bash when you add new merge config
>> */
>> else
>> - die("unknown style '%s' given for '%s'",
>> - value, var);
>> + warning("ignored unknown style '%s' given for '%s'",
>> + value, var);
>> return 0;
>> }
>> return git_default_config(var, value, cb);
