Merge branch 'sp/smart-http-failure-to-push' into maint

* sp/smart-http-failure-to-push:
  : Mask SIGPIPE on the command channel going to a transport helper
  disconnect from remote helpers more gently

Conflicts:
	transport-helper.c

diff --cc transport-helper.c
index 6f227e253bf638de37ce74347213657c23185afa,7636a2771aedc3b6b4ae278fd1cc35e1278510db..f6b3b1fb79468ef85eb9581c7d44ff04c1bb61bc
--- 1/transport-helper.c
--- 2/transport-helper.c
+++ b/transport-helper.c
@@@ -220,8 -204,6 +221,7 @@@ static struct child_process *get_helper
  static int disconnect_helper(struct transport *transport)
  {
        struct helper_data *data = transport->data;
-       struct strbuf buf = STRBUF_INIT;
 +      int res = 0;
  
        if (data->helper) {
                if (debug)