From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Barkalow Subject: [PATCH 2/2] Clean up connection correctly if object fetch wasn't done Date: Mon, 4 Feb 2008 13:26:29 -0500 (EST) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 04 19:28:09 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JM62w-0003Mt-4W for gcvg-git-2@gmane.org; Mon, 04 Feb 2008 19:27:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754790AbYBDS0d (ORCPT ); Mon, 4 Feb 2008 13:26:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754170AbYBDS0d (ORCPT ); Mon, 4 Feb 2008 13:26:33 -0500 Received: from iabervon.org ([66.92.72.58]:40279 "EHLO iabervon.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754760AbYBDS0c (ORCPT ); Mon, 4 Feb 2008 13:26:32 -0500 Received: (qmail 21109 invoked by uid 1000); 4 Feb 2008 18:26:29 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 4 Feb 2008 18:26:29 -0000 User-Agent: Alpine 1.00 (LNX 882 2007-12-20) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Further optimization allowed the fetch_objs call to be skipped if it isn't necessary. However, this leaves the connection in need of cleaning up to avoid getting an error message from the remote end when ssh is used. Fix this. Signed-off-by: Daniel Barkalow --- builtin-fetch.c | 2 ++ transport.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/builtin-fetch.c b/builtin-fetch.c index 320e235..ac335f2 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -557,6 +557,8 @@ static int do_fetch(struct transport *transport, free_refs(fetch_map); + transport_disconnect(transport); + return 0; } diff --git a/transport.c b/transport.c index 53fb2ec..199e9e6 100644 --- a/transport.c +++ b/transport.c @@ -677,7 +677,15 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const static int disconnect_git(struct transport *transport) { - free(transport->data); + struct git_transport_data *data = transport->data; + if (data->conn) { + packet_flush(data->fd[1]); + close(data->fd[0]); + close(data->fd[1]); + finish_connect(data->conn); + } + + free(data); return 0; } -- 1.5.4