summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorBrian Hetro <whee@smaertness.net>2008-07-05 01:24:43 -0400
committerJunio C Hamano <gitster@pobox.com>2008-07-05 17:42:34 -0700
commitdaec808cc61af32de789a31dd5c96001915c3f2d (patch)
treea25032d059b45ce7a5f4acc9927d313c7648ea34 /diff.c
parentcd8be6c9b64adcb7744aba89bac8ef4261ccacc5 (diff)
downloadgit-daec808cc61af32de789a31dd5c96001915c3f2d.tar.gz
diff.c: Use 'git_config_string' to get 'diff.external'
Signed-off-by: Brian Hetro <whee@smaertness.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/diff.c b/diff.c
index f281c5b82a..78c4d3a35a 100644
--- 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, '.');