Merge branch 'jk/trailer-fixes' into maint

diff --git a/commit.c b/commit.c
index 449c1f4920cff631f5cf2479772c350c9b8b7325..db679c2adfd766a385f5406e6413ad13ba1e27af 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1787,10 +1787,10 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
  * Returns the number of bytes from the tail to ignore, to be fed as
  * the second parameter to append_signoff().
  */
-int ignore_non_trailer(const char *buf, size_t len)
+size_t ignore_non_trailer(const char *buf, size_t len)
 {
-       int boc = 0;
-       int bol = 0;
+       size_t boc = 0;
+       size_t bol = 0;
        int in_old_conflicts_block = 0;
        size_t cutoff = wt_status_locate_end(buf, len);