Merge branch 'jk/trailer-fixes'

[thirdparty/git.git] / commit.c

diff --git a/commit.c b/commit.c
index 5781f9bc675722041b9ffb0471f4c959fba48924..d6f7f5e4d2d7facc20fc8f8d2fadfa25c47f68be 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1426,10 +1426,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);