Merge branch 'maint'

[git.git] / builtin-tag.c

diff --git a/builtin-tag.c b/builtin-tag.c
index 219f51d6fc56d1d4a7623cd921e9f18dc7e0ca90..325b1b2632e44121c23bc6df556bf3aa4e32ba04 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -295,7 +295,11 @@ static void create_tag(const unsigned char *object, const char *tag,
                        write_or_die(fd, tag_template, strlen(tag_template));
                close(fd);
 
-               launch_editor(path, buf, NULL);
+               if (launch_editor(path, buf, NULL)) {
+                       fprintf(stderr,
+                       "Please supply the message using either -m or -F option.\n");
+                       exit(1);
+               }
 
                unlink(path);
                free(path);