Re: [PATCH] contrib/git-jump: cat output when not a terminal
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 11, 2020, 15:36 UTC
- Message-ID
- <xmqqr1vqscuy.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20200511143157.GA1415@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> - I'm pretty sure git-jump does _not_ work with emacs or emacsclient.
;-) Its output can be used in M-x find-grep, though, actually.
> However, it should work with gvim, and any isatty() check would > potentially cause issues there. So I'd much prefer the caller say > explicitly that they're not expecting the editor to start.
Yes, that is exactly what I was worried about.
> So I'm OK to leave the status quo and let people use the GIT_EDITOR > solution in this instance. But I'd also be happy to take a patch for > "--no-editor" or similar if somebody wants to work it up.
I actually would support --no-editor. One thing nobody noticed so far is that "git-jump" is only compatible with editors that support the "-q" option from the command line, and "cat" is not among them.
Another thing I was thinking about was a change like the attached. Plugging it thru "git var" to allow "git var GIT_JUMP_EDITOR" may allow vim users to set it to 'cat' while setting GIT_EDITOR to vim.
It still needs a fix to get rid of the uncondtional "-q" option from open_editor() function, though.
cache.h | 2 +- editor.c | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/cache.h b/cache.h index 0f0485ecfe..b3f7a6d6c4 100644 --- a/cache.h +++ b/cache.h @@ -1649,7 +1649,7 @@ const char *fmt_ident(const char *name, const char *email, const char *fmt_name(enum want_ident); const char *ident_default_name(void); const char *ident_default_email(void); -const char *git_editor(void); +const char *git_editor(const char *); const char *git_sequence_editor(void); const char *git_pager(int stdout_is_tty); int is_terminal_dumb(void); diff --git a/editor.c b/editor.c index 91989ee8a1..3d04824e9e 100644 --- a/editor.c +++ b/editor.c @@ -14,11 +14,29 @@ int is_terminal_dumb(void) return !terminal || !strcmp(terminal, "dumb"); } -const char *git_editor(void) +const char *git_editor(const char *program) { - const char *editor = getenv("GIT_EDITOR"); + const char *editor = NULL; int terminal_is_dumb = is_terminal_dumb(); + if (program) { + char *varname; + + varname = xstrfmt("GIT_%s_EDITOR", program); + editor = getenv(varname); + free(varname); + + if (!editor) { + struct strbuf progname = STRBUF_INIT; + strbuf_addstr(&progname, program); + strbuf_tolower(&progname); + varname = xstrfmt("%s.editor", progname.buf); + git_config_get_string_const(varname, &editor); + free(varname); + strbuf_release(&progname); + } + } + if (!editor && editor_program) editor = editor_program; if (!editor && !terminal_is_dumb) @@ -37,14 +55,7 @@ const char *git_editor(void) const char *git_sequence_editor(void) { - const char *editor = getenv("GIT_SEQUENCE_EDITOR"); - - if (!editor) - git_config_get_string_const("sequence.editor", &editor); - if (!editor) - editor = git_editor(); - - return editor; + return git_editor("SEQUENCE"); } static int launch_specified_editor(const char *editor, const char *path, @@ -118,7 +129,7 @@ static int launch_specified_editor(const char *editor, const char *path, int launch_editor(const char *path, struct strbuf *buffer, const char *const *env) { - return launch_specified_editor(git_editor(), path, buffer, env); + return launch_specified_editor(git_editor(NULL), path, buffer, env); } int launch_sequence_editor(const char *path, struct strbuf *buffer,