Skip to content

Commit

Permalink
Merge branch 'dl/packet-read-response-end-fix'
Browse files Browse the repository at this point in the history
Error message update.

* dl/packet-read-response-end-fix:
  pkt-line: replace "stateless separator" with "response end"
  • Loading branch information
gitster committed Jul 28, 2021
2 parents eb27b33 + 8232a0f commit 1e893a1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkt-line.c
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion remote-curl.c
Expand Up @@ -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"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion serve.c
Expand Up @@ -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");
}
}

Expand Down

0 comments on commit 1e893a1

Please sign in to comment.