summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-02-16 06:01:41 +0100
committerJunio C Hamano <gitster@pobox.com>2008-02-15 21:24:53 -0800
commitee9601e6bef2281e3183e127e1e4e36ed257af7a (patch)
tree3947e274d394f2f6b48e159de8e07c0cd9b3db4d /config.c
parent872da32d80c004c26a19a5d6cb31eb3e7f034094 (diff)
downloadgit-ee9601e6bef2281e3183e127e1e4e36ed257af7a.tar.gz
Add "const" qualifier to "char *editor_program".
Also use "git_config_string" to simplify "config.c" code where "editor_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/config.c b/config.c
index eb6d2ad78b..703c2085a5 100644
--- a/config.c
+++ b/config.c
@@ -443,12 +443,8 @@ int git_default_config(const char *var, const char *value)
if (!strcmp(var, "core.pager"))
return git_config_string(&pager_program, var, value);
- if (!strcmp(var, "core.editor")) {
- if (!value)
- return config_error_nonbool(var);
- editor_program = xstrdup(value);
- return 0;
- }
+ if (!strcmp(var, "core.editor"))
+ return git_config_string(&editor_program, var, value);
if (!strcmp(var, "core.excludesfile")) {
if (!value)