launch_editor(): Heed GIT_EDITOR and core.editor settings

diff --git a/environment.c b/environment.c
index f83fb9e44806c03cde06eede7888a4dcb901c5c3..35d3f4b595872c39c640ca0f71e7846d3ad053f2 100644 (file)
--- 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;