Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint

diff --git a/strbuf.c b/strbuf.c
index c7cd529b3b46e2ea0fc58f2bad89a290cf4e5546..05d0693eba1eba4e2f21057388368c0890e668fe 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -106,7 +106,8 @@ void strbuf_ltrim(struct strbuf *sb)
        sb->buf[sb->len] = '\0';
 }
 
-struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int max)
+struct strbuf **strbuf_split_buf(const char *str, size_t slen,
+                                int terminator, int max)
 {
        struct strbuf **ret = NULL;
        size_t nr = 0, alloc = 0;
@@ -115,7 +116,7 @@ struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int ma
        while (slen) {
                int len = slen;
                if (max <= 0 || nr + 1 < max) {
-                       const char *end = memchr(str, delim, slen);
+                       const char *end = memchr(str, terminator, slen);
                        if (end)
                                len = end - str + 1;
                }