Merge branch 'jc/maint-add-p-overlapping-hunks' into maint

diff --git a/transport-helper.c b/transport-helper.c
index 8866adf08898f5855dd1dea1db4286021ffb880c..660147f9e96be7b69379a9040c4220c141c7be4c 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -76,7 +76,7 @@ static void write_constant(int fd, const char *str)
                die_errno("Full write to remote helper failed");
 }
 
-const char *remove_ext_force(const char *url)
+static const char *remove_ext_force(const char *url)
 {
        if (url) {
                const char *colon = strchr(url, ':');
@@ -561,10 +561,9 @@ static int push_refs_with_push(struct transport *transport,
        int mirror = flags & TRANSPORT_PUSH_MIRROR;
        struct helper_data *data = transport->data;
        struct strbuf buf = STRBUF_INIT;
-       struct child_process *helper;
        struct ref *ref;
 
-       helper = get_helper(transport);
+       get_helper(transport);
        if (!data->push)
                return 1;
 
@@ -972,7 +971,7 @@ static int udt_do_read(struct unidirectional_transfer *t)
  */
 static int udt_do_write(struct unidirectional_transfer *t)
 {
-       size_t bytes;
+       ssize_t bytes;
 
        if (t->bufuse == 0)
                return 0;       /* Nothing to write. */