Export launch_editor() and make it accept ':' as a no-op editor.
Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d63c2fd192
commit
943316e96c
@ -17,7 +17,7 @@ static const char builtin_tag_usage[] =
|
|||||||
|
|
||||||
static char signingkey[1000];
|
static char signingkey[1000];
|
||||||
|
|
||||||
static void launch_editor(const char *path, struct strbuf *buffer)
|
void launch_editor(const char *path, struct strbuf *buffer)
|
||||||
{
|
{
|
||||||
const char *editor, *terminal;
|
const char *editor, *terminal;
|
||||||
struct child_process child;
|
struct child_process child;
|
||||||
@ -42,6 +42,9 @@ static void launch_editor(const char *path, struct strbuf *buffer)
|
|||||||
if (!editor)
|
if (!editor)
|
||||||
editor = "vi";
|
editor = "vi";
|
||||||
|
|
||||||
|
if (!strcmp(editor, ":"))
|
||||||
|
return;
|
||||||
|
|
||||||
memset(&child, 0, sizeof(child));
|
memset(&child, 0, sizeof(child));
|
||||||
child.argv = args;
|
child.argv = args;
|
||||||
args[0] = editor;
|
args[0] = editor;
|
||||||
|
1
strbuf.h
1
strbuf.h
@ -117,5 +117,6 @@ extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
|
|||||||
extern int strbuf_getline(struct strbuf *, FILE *, int);
|
extern int strbuf_getline(struct strbuf *, FILE *, int);
|
||||||
|
|
||||||
extern void stripspace(struct strbuf *buf, int skip_comments);
|
extern void stripspace(struct strbuf *buf, int skip_comments);
|
||||||
|
extern void launch_editor(const char *path, struct strbuf *buffer);
|
||||||
|
|
||||||
#endif /* STRBUF_H */
|
#endif /* STRBUF_H */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user