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>
This commit is contained in:
committed by
Junio C Hamano
parent
62e09ce998
commit
4d87b9c5db
@ -24,7 +24,11 @@ static void launch_editor(const char *path, char **buffer, unsigned long *len)
|
||||
const char *args[3];
|
||||
int fd;
|
||||
|
||||
editor = getenv("VISUAL");
|
||||
editor = getenv("GIT_EDITOR");
|
||||
if (!editor && editor_program)
|
||||
editor = editor_program;
|
||||
if (!editor)
|
||||
editor = getenv("VISUAL");
|
||||
if (!editor)
|
||||
editor = getenv("EDITOR");
|
||||
|
||||
@ -249,9 +253,9 @@ static void create_tag(const unsigned char *object, const char *tag,
|
||||
char *message, int sign, unsigned char *result)
|
||||
{
|
||||
enum object_type type;
|
||||
char header_buf[1024], *buffer;
|
||||
char header_buf[1024], *buffer = NULL;
|
||||
int header_len, max_size;
|
||||
unsigned long size;
|
||||
unsigned long size = 0;
|
||||
|
||||
type = sha1_object_info(object, NULL);
|
||||
if (type <= 0)
|
||||
|
||||
Reference in New Issue
Block a user