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

diff --git a/transport-helper.c b/transport-helper.c
index 5846b55875f6e568711b2f90726bb6608aaf4e73..660147f9e96be7b69379a9040c4220c141c7be4c 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -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;