mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach git var about GIT_EDITOR

Browse Source 
Expose the command used by launch_editor() for scripts to use.
This should allow one to avoid searching for a proper editor
separately in each command.

git_editor(void) uses the logic to decide which editor to use
that used to live in launch_editor().  The function returns NULL
if there is no suitable editor; the caller is expected to issue
an error message when appropriate.

launch_editor() uses git_editor() and gives the error message the
same way as before when EDITOR is not set.

"git var GIT_EDITOR" gives the editor name, or an error message
when there is no appropriate one.

"git var -l" gives GIT_EDITOR=name only if there is an
appropriate editor.

Originally-submitted-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2009-11-11 18:01:27 -06:00
committed by Junio C Hamano
parent c27b39252f
commit 44fcb4977c
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor.c
View File

@ -2,7 +2,7 @@
#include "strbuf.h"
#include "run-command.h"
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
const char *git_editor(void)
{
const char *editor = getenv("GIT_EDITOR");
const char *terminal = getenv("TERM");
@ -16,11 +16,21 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
editor = getenv("EDITOR");
if (!editor && terminal_is_dumb)
return error("terminal is dumb, but EDITOR unset");
return NULL;
if (!editor)
editor = "vi";
return editor;
}
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
{
const char *editor = git_editor();
if (!editor)
return error("Terminal is dumb, but EDITOR unset");
if (strcmp(editor, ":")) {
size_t len = strlen(editor);
int i = 0;