# [PATCH] Clean up connection correctly if object fetch wasn't done 2 messages from 2008-01-26 to 2008-01-26. Participants: Daniel Barkalow, Johannes Schindelin. Thread: https://gitlist.dev/t/11753 ## Daniel Barkalow, 2008-01-26 21:49 Subject: [PATCH] Clean up connection correctly if object fetch wasn't done Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0801261647310.13593%40iabervon.org ``` 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 --- This fixes the "fatal: The remote end hung up unexpectedly" message in the case I reproduced. It should probably get squashed into the other single-connect commit, but I'm sending it separately for easier testing for now. 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.rc3.4.g16335 ``` ## Johannes Schindelin, 2008-01-26 22:06 Subject: Re: [PATCH] Clean up connection correctly if object fetch wasn't done Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0801262205130.23907%40racer.site In-Reply-To: ``` Hi, On Sat, 26 Jan 2008, Daniel Barkalow wrote: > 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 > --- > This fixes the "fatal: The remote end hung up unexpectedly" message in the > case I reproduced. It should probably get squashed into the other > single-connect commit, but I'm sending it separately for easier testing > for now. Yeah, that fixes it. Thanks. > 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; > } Should this not set transport->data = NULL, just to be sure? Ciao, Dscho ```