diff options
| author |  Tanay Abhra <tanayabh@gmail.com> | 2014-08-13 18:13:04 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-13 12:36:21 -0700 |
| commit | 6ea358f784a5d8823565a8574d8ed914e51096f4 (patch) | |
| tree | fe0c013813343fdb0ea31e6d10595aece4feff27 /editor.c | |
| parent | fast-import.c: replace `git_config()` with `git_config_get_*()` family (diff) | |
| download | tgif-6ea358f784a5d8823565a8574d8ed914e51096f4.tar.xz | |
ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`
There is one slight behavior change, previously "merge.default"
silently ignored a NULL value and didn't raise any error. But,
in the same function, all other values raise an error on a NULL
value. So to conform with other call sites in Git, a NULL value
for "merge.default" raises an error.
The the new config-set API is not very useful here, because much of
the function is dedicated to processing "merge.<name>.variable",
which the new API does not handle well. If it were for variables
like, "merge.summary", "merge.tool", and "merge.verbosity", we could
use the new API.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'editor.c')
0 files changed, 0 insertions, 0 deletions