builtin/apply: make check_apply_state() return -1 instead of die()ing

diff --git a/commit.h b/commit.h
index 71693ce0fd9613320114586a3c23d309e8427368..23ae0c1d642c1b83ed0af383625e48bce710b10b 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -184,6 +184,7 @@ extern const char *format_subject(struct strbuf *sb, const char *msg,
                                  const char *line_separator);
 extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
 extern int commit_format_is_empty(enum cmit_fmt);
+extern const char *skip_blank_lines(const char *msg);
 extern void format_commit_message(const struct commit *commit,
                                  const char *format, struct strbuf *sb,
                                  const struct pretty_print_context *context);