From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] Replace "stateless separator" with "response end"
Date: Thu, 8 Jul 2021 19:27:22 -0700 [thread overview]
Message-ID: <9c834801c85d873738577a45c87d4404a23666d6.1625797617.git.liu.denton@gmail.com> (raw)
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>
---
pkt-line.c | 2 +-
remote-curl.c | 2 +-
serve.c | 2 +-
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");
}
}
--
2.32.0.rc1.186.g3cb6fa43cd
reply other threads:[~2021-07-09 2:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9c834801c85d873738577a45c87d4404a23666d6.1625797617.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).