mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-25 18:25:11 +02:00
Code

Merge branch 'jt/fetch-peek-optional-section' into next 

"git fetch" unnecessarily failed when an unexpected optional
section appeared in the output, which has been corrected.

* jt/fetch-peek-optional-section:
  fetch-pack: make unexpected peek result non-fatal
This commit is contained in:
Junio C Hamano 2022-05-18 11:32:23 -07:00
parent 870a1a1a71 7709acf7be
commit bc876bd2cf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fetch-pack.c
View File

@ -1370,17 +1370,20 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
static int process_section_header(struct packet_reader *reader,
const char *section, int peek)
{
int ret;
int ret = 0;
if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
die(_("error reading section header '%s'"), section);
ret = !strcmp(reader->line, section);
if (packet_reader_peek(reader) == PACKET_READ_NORMAL &&
!strcmp(reader->line, section))
ret = 1;
if (!peek) {
if (!ret)
die(_("expected '%s', received '%s'"),
section, reader->line);
if (!ret) {
if (reader->line)
die(_("expected '%s', received '%s'"),
section, reader->line);
else
die(_("expected '%s'"), section);
}
packet_reader_read(reader);
}