Browse Source

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

"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
maint
Junio C Hamano 3 years ago
parent
commit
9cf4e0c8d2
  1. 15
      fetch-pack.c

15
fetch-pack.c

@ -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, static int process_section_header(struct packet_reader *reader,
const char *section, int peek) 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 (!peek) {
if (!ret) if (!ret) {
if (reader->line)
die(_("expected '%s', received '%s'"), die(_("expected '%s', received '%s'"),
section, reader->line); section, reader->line);
else
die(_("expected '%s'"), section);
}
packet_reader_read(reader); packet_reader_read(reader);
} }



Loading…
Cancel
Save