Code

diff.c: Use 'git_config_string' to get 'diff.external'
authorBrian Hetro <whee@smaertness.net>
Sat, 5 Jul 2008 05:24:43 +0000 (01:24 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jul 2008 00:42:34 +0000 (17:42 -0700)
Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c

diff --git a/diff.c b/diff.c
index f281c5b82a623623f5840c19261155ede81e1301..78c4d3a35a975d0ffef51dbe999d14938d0a90e3 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -153,12 +153,8 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
                diff_auto_refresh_index = git_config_bool(var, value);
                return 0;
        }
-       if (!strcmp(var, "diff.external")) {
-               if (!value)
-                       return config_error_nonbool(var);
-               external_diff_cmd_cfg = xstrdup(value);
-               return 0;
-       }
+       if (!strcmp(var, "diff.external"))
+               return git_config_string(&external_diff_cmd_cfg, var, value);
        if (!prefixcmp(var, "diff.")) {
                const char *ep = strrchr(var, '.');