summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-20 13:06:09 +0100
committerJunio C Hamano <gitster@pobox.com>2007-07-21 16:51:14 -0700
commit4d87b9c5db2590f7616fedfc0a538fc78f528e14 (patch)
treee6422ae717c460cb0e53852507af05dec979328d /environment.c
parent62e09ce998dd7f6b844deb650101c743a5c4ce50 (diff)
downloadgit-4d87b9c5db2590f7616fedfc0a538fc78f528e14.tar.gz
launch_editor(): Heed GIT_EDITOR and core.editor settings
In the commit 'Add GIT_EDITOR environment and core.editor configuration variables', this was done for the shell scripts. Port it over to builtin-tag's version of launch_editor(), which is just about to be refactored into editor.c. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index f83fb9e448..35d3f4b595 100644
--- a/environment.c
+++ b/environment.c
@@ -33,6 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024;
char *pager_program;
int pager_in_use;
int pager_use_color = 1;
+char *editor_program;
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
static const char *git_dir;