Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-28 23:17:56 +0300
committerJunio C Hamano <gitster@pobox.com>2021-07-28 23:17:56 +0300
commit1e893a1216a1eec0e5e28e0a26098354e4d5a909 (patch)
tree02856c4872b90ae02adf3cd6bf1e8e2103d0cf34
parenteb27b338a3e71c7c4079fbac8aeae3f8fbb5c687 (diff)
parent8232a0ff48ce0959e20db9ffa1c4e16d4657dbec (diff)
Merge branch 'dl/packet-read-response-end-fix'
Error message update. * dl/packet-read-response-end-fix: pkt-line: replace "stateless separator" with "response end"
-rw-r--r--pkt-line.c2
-rw-r--r--remote-curl.c2
-rw-r--r--serve.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 98304ce374..9f63eae2e6 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -103,7 +103,7 @@ void packet_response_end(int fd)
{
packet_trace("0002", 4, 1);
if (write_in_full(fd, "0002", 4) < 0)
- die_errno(_("unable to write stateless separator packet"));
+ die_errno(_("unable to write response end packet"));
}
int packet_flush_gently(int fd)
diff --git a/remote-curl.c b/remote-curl.c
index 9d432c299a..6c320d5704 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -653,7 +653,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,
memcpy(buf - 4, "0000", 4);
break;
case PACKET_READ_RESPONSE_END:
- die(_("remote server sent stateless separator"));
+ die(_("remote server sent unexpected response end packet"));
}
}
diff --git a/serve.c b/serve.c
index aa8209f147..f11c0e07c4 100644
--- a/serve.c
+++ b/serve.c
@@ -258,7 +258,7 @@ static int process_request(void)
state = PROCESS_REQUEST_DONE;
break;
case PACKET_READ_RESPONSE_END:
- BUG("unexpected stateless separator packet");
+ BUG("unexpected response end packet");
}
}