summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2021-07-09 02:27:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-09 18:51:17 (GMT)
commit8232a0ff48ce0959e20db9ffa1c4e16d4657dbec (patch)
treefe7f9b74d26f3029497aa6d4303be364d60c2018
parentb0df0c16ead4c5512d506dcbbdf31194d992803c (diff)
downloadgit-8232a0ff48ce0959e20db9ffa1c4e16d4657dbec.zip
git-8232a0ff48ce0959e20db9ffa1c4e16d4657dbec.tar.gz
git-8232a0ff48ce0959e20db9ffa1c4e16d4657dbec.tar.bz2
pkt-line: replace "stateless separator" with "response end"
In 0181b600a6 (pkt-line: define PACKET_READ_RESPONSE_END, 2020-05-19), the Response End packet was defined for Git's network protocol. When the patch was sent, it included an oversight where the error messages referenced "stateless separator", the work-in-progress name, over "response end", the final name chosen. Correct these error messages by having them correctly reference a "response end" packet. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 8f9bc68..4f0264b 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 75532a8..3c6eceb 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -602,7 +602,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 c046926..4bf5e9b 100644
--- a/serve.c
+++ b/serve.c
@@ -218,7 +218,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");
}
}