summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-11 06:17:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-11 06:17:46 (GMT)
commit55d1932bce99d83fa0d891331fe3f3562d33af2e (patch)
treecfd50a538a7214041f60dba488e3e48462e2a579 /config.c
parent98e79f63be7e2cf043bd3150ae9ac0c8d118ce61 (diff)
parentf653aee5a37b909e772d612eb7e226f09fd2f3d3 (diff)
downloadgit-55d1932bce99d83fa0d891331fe3f3562d33af2e.zip
git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.gz
git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.bz2
Merge branch 'cr/tag'
* cr/tag: Teach "git stripspace" the --strip-comments option Make verify-tag a builtin. builtin-tag.c: Fix two memory leaks and minor notation changes. launch_editor(): Heed GIT_EDITOR and core.editor settings Make git tag a builtin.
Diffstat (limited to 'config.c')
-rw-r--r--config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.c b/config.c
index dd2de6e..dc3148d 100644
--- a/config.c
+++ b/config.c
@@ -426,6 +426,11 @@ int git_default_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.editor")) {
+ editor_program = xstrdup(value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}