Revision efd02e92c9961063bae63da7f7446868a38f14ce authored by Junio C Hamano on 31 May 2011, 19:08:48 UTC, committed by Junio C Hamano on 31 May 2011, 19:08:48 UTC
* jl/read-tree-m-dry-run: Teach read-tree the -n|--dry-run option unpack-trees: add the dry_run flag to unpack_trees_options
editor.c
#include "cache.h"
#include "strbuf.h"
#include "run-command.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 };
if (run_command_v_opt_cd_env(args, RUN_USING_SHELL, NULL, env))
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 ...