Revision e6604c3537e8b60d6cbc821e7d356924c0a0e809 authored by Jonathan Nieder on 02 August 2013, 22:16:40 UTC, committed by Junio C Hamano on 05 August 2013, 15:19:47 UTC
$ git log --encoding fatal: Option '--encoding' requires a value $ git rev-list --encoding fatal: Option '--encoding' requires a value The argument to --encoding has always been mandatory. Unfortunately manpages like git-rev-list(1), git-log(1), and git-show(1) have described the option's syntax as "--encoding[=<encoding>]" since it was first documented. Clarify by removing the extra brackets. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 117eea7
editor.c
#include "cache.h"
#include "strbuf.h"
#include "run-command.h"
#include "sigchain.h"
#ifndef DEFAULT_EDITOR
#define DEFAULT_EDITOR "vi"
#endif
const char *git_editor(void)
{
const char *editor = getenv("GIT_EDITOR");
const char *terminal = getenv("TERM");
int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
if (!editor && editor_program)
editor = editor_program;
if (!editor && !terminal_is_dumb)
editor = getenv("VISUAL");
if (!editor)
editor = getenv("EDITOR");
if (!editor && terminal_is_dumb)
return NULL;
if (!editor)
editor = DEFAULT_EDITOR;
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, ":")) {
const char *args[] = { editor, path, NULL };
struct child_process p;
int ret, sig;
memset(&p, 0, sizeof(p));
p.argv = args;
p.env = env;
p.use_shell = 1;
if (start_command(&p) < 0)
return error("unable to start editor '%s'", editor);
sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
sig = ret - 128;
sigchain_pop(SIGINT);
sigchain_pop(SIGQUIT);
if (sig == SIGINT || sig == SIGQUIT)
raise(sig);
if (ret)
return error("There was a problem with the editor '%s'.",
editor);
}
if (!buffer)
return 0;
if (strbuf_read_file(buffer, path, 0) < 0)
return error("could not read file '%s': %s",
path, strerror(errno));
return 0;
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...