From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Mar 2012 06:16:33 +0000 (-0800)
Subject: Merge branch 'sp/smart-http-failure-to-push' into maint
X-Git-Tag: v1.7.9.3~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4d7615453eff93838d496db6b533b327c8cadfc;p=git.git

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
---

a4d7615453eff93838d496db6b533b327c8cadfc
diff --cc transport-helper.c
index 6f227e253,7636a2771..f6b3b1fb7
--- a/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)