aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-11-02 11:33:08 -0400
committerJunio C Hamano <gitster@pobox.com>2007-11-22 17:05:02 -0800
commit943316e96ca2dad67086af2f945e42467a27ddd6 (patch)
tree50b5a90729d6f0c85bb6e02938d1426aafeee983
parentd63c2fd192271ea2d85c81edfad90aa42fec26ee (diff)
downloadgit-943316e96ca2dad67086af2f945e42467a27ddd6.tar.gz
git-943316e96ca2dad67086af2f945e42467a27ddd6.tar.xz
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>
-rw-r--r--builtin-tag.c5
-rw-r--r--strbuf.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/builtin-tag.c b/builtin-tag.c
index cbb0f04e8..88a5449e6 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -17,7 +17,7 @@ static const char builtin_tag_usage[] =
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;
struct child_process child;
@@ -42,6 +42,9 @@ static 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;
diff --git a/strbuf.h b/strbuf.h
index 13919123d..8334a9bad 100644
--- a/strbuf.h
+++ b/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 void stripspace(struct strbuf *buf, int skip_comments);
+extern void launch_editor(const char *path, struct strbuf *buffer);
#endif /* STRBUF_H */