]> git.ipfire.org Git - thirdparty/git.git/commitdiff
pkt-line: replace "stateless separator" with "response end"
authorDenton Liu <liu.denton@gmail.com>
Fri, 9 Jul 2021 02:27:22 +0000 (19:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Jul 2021 18:51:17 +0000 (11:51 -0700)
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>
pkt-line.c
remote-curl.c
serve.c

index 8f9bc68ee28ef46b2cd221a46a2049bf8a633511..4f0264b47935bf3cebd0c7d0cbf13c8da2aaf150 100644 (file)
@@ -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)
index 75532a8baea8f20eb2c4aaa0f82c287a0dbaf617..3c6eceb7be6118058dbc96de48c01db7b4214aca 100644 (file)
@@ -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 c046926ba141c76fc2a6b6fb1db80e31c1c28e8c..4bf5e9b0c16b818686dfc8eba24eadb24adc9ddc 100644 (file)
--- 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");
                }
        }