Merge branch 'dl/packet-read-response-end-fix'

gitster · gitster · commit 1e893a1216a1 · 2021-07-28T13:17:56.000-07:00
Error message update.

* dl/packet-read-response-end-fix:
  pkt-line: replace "stateless separator" with "response end"
diff --git 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
@@ -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
@@ -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");
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void packet_response_end(int fd)`
`103`	`103`	`{`
`104`	`104`	`packet_trace("0002", 4, 1);`
`105`	`105`	`if (write_in_full(fd, "0002", 4) < 0)`
`106`		`- die_errno(_("unable to write stateless separator packet"));`
	`106`	`+ die_errno(_("unable to write response end packet"));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`int packet_flush_gently(int fd)`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,`
`653`	`653`	`memcpy(buf - 4, "0000", 4);`
`654`	`654`	`break;`
`655`	`655`	`case PACKET_READ_RESPONSE_END:`
`656`		`- die(_("remote server sent stateless separator"));`
	`656`	`+ die(_("remote server sent unexpected response end packet"));`
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static int process_request(void)`
`258`	`258`	`state = PROCESS_REQUEST_DONE;`
`259`	`259`	`break;`
`260`	`260`	`case PACKET_READ_RESPONSE_END:`
`261`		`- BUG("unexpected stateless separator packet");`
	`261`	`+ BUG("unexpected response end packet");`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`