summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-05-19 16:54:19 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-05-20 02:41:45 +0200
commitac11219b8014fec1c5a83f1b19cf78015adc856c (patch)
tree2623e64e51a786d31bb1e595743756ce11ff7906
parent588a43af543f9a00345a6e464a61c51aebad88da (diff)
downloadlibgit2-cmn/fetch-terminate.tar.gz
smart: send a flush when we disconnectcmn/fetch-terminate
The git server wants to hear a flush from us when we disconnect, particularly when we want to perform a fetch but are up to date.
-rw-r--r--src/transports/smart.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/transports/smart.c b/src/transports/smart.c
index 69eaf9b78..7fb41f788 100644
--- a/src/transports/smart.c
+++ b/src/transports/smart.c
@@ -272,6 +272,18 @@ static int git_smart__close(git_transport *transport)
unsigned int i;
git_pkt *p;
int ret;
+ git_smart_subtransport_stream *stream;
+ const char flush[] = "0000";
+
+ /*
+ * If we're still connected at this point and not using RPC,
+ * we should say goodbye by sending a flush, or git-daemon
+ * will complain that we disconnected unexpectedly.
+ */
+ if (t->connected && !t->rpc &&
+ !t->wrapped->action(&stream, t->wrapped, t->url, GIT_SERVICE_UPLOADPACK)) {
+ t->current_stream->write(t->current_stream, flush, 4);
+ }
ret = git_smart__reset_stream(t, true);