From: Brian Hetro <whee@smaertness.net>
Date: Sat, 5 Jul 2008 05:24:43 +0000 (-0400)
Subject: diff.c: Use 'git_config_string' to get 'diff.external'
X-Git-Tag: v1.5.6.3~12^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daec808cc61af32de789a31dd5c96001915c3f2d;p=thirdparty%2Fgit.git

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>
---

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, '.');