diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-11-08 14:06:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 17:05:02 -0800 |
| commit | e97c9ad96b60d51b0b3852aaaff146015d01cb62 (patch) | |
| tree | ea89e1bbea0b444ab45c5859beb13016aa082882 /builtin-tag.c | |
| parent | f5bbc3225c4b073a7ff3218164a0c820299bc9c6 (diff) | |
| download | git-e97c9ad96b60d51b0b3852aaaff146015d01cb62.tar.gz git-e97c9ad96b60d51b0b3852aaaff146015d01cb62.tar.xz | |
launch_editor(): read the file, even when EDITOR=:
Earlier we just returned in case EDITOR=: but the message stored
in the file was not read back. Fix this, at the same time
simplifying the code as suggested by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-tag.c')
| -rw-r--r-- | builtin-tag.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/builtin-tag.c b/builtin-tag.c index 88a5449e6..566b9d186 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -20,8 +20,6 @@ static char signingkey[1000]; void launch_editor(const char *path, struct strbuf *buffer) { const char *editor, *terminal; - struct child_process child; - const char *args[3]; editor = getenv("GIT_EDITOR"); if (!editor && editor_program) @@ -42,17 +40,12 @@ void launch_editor(const char *path, struct strbuf *buffer) if (!editor) editor = "vi"; - if (!strcmp(editor, ":")) - return; - - memset(&child, 0, sizeof(child)); - child.argv = args; - args[0] = editor; - args[1] = path; - args[2] = NULL; + if (strcmp(editor, ":")) { + const char *args[] = { editor, path, NULL }; - if (run_command(&child)) - die("There was a problem with the editor %s.", editor); + if (run_command_v_opt(args, 0)) + die("There was a problem with the editor %s.", editor); + } if (strbuf_read_file(buffer, path, 0) < 0) die("could not read message file '%s': %s", |