Merge branch 'jk/trailer-fixes' into maint

diff --git a/commit.h b/commit.h
index da0db36eba2bf16277dbb7aadcb3384e29191ecc..43f93b973dffe3bf8e56aa175e66304c72b0e30a 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -322,7 +322,7 @@ extern const char *find_commit_header(const char *msg, const char *key,
                                      size_t *out_len);
 
 /* Find the end of the log message, the right place for a new trailer. */
-extern int ignore_non_trailer(const char *buf, size_t len);
+extern size_t ignore_non_trailer(const char *buf, size_t len);
 
 typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
                                 void *cb_data);