Merge branch 'jk/commit-C-pick-empty'

diff --git a/builtin/commit.c b/builtin/commit.c
index caec5c0e186f0b2870fc9066f34425cec06283a9..0320efd57d51d3bf78bedd958b895e5a44fca640 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -676,9 +676,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
        } else if (use_message) {
                char *buffer;
                buffer = strstr(use_message_buffer, "\n\n");
-               if (!use_editor && (!buffer || buffer[2] == '\0'))
-                       die(_("commit has empty message"));
-               strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
+               if (buffer)
+                       strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
                hook_arg1 = "commit";
                hook_arg2 = use_message;
        } else if (fixup_message) {