Browse Source

Merge branch 'jt/fetch-pack-request-fix' into jt/push-negotiation

* jt/fetch-pack-request-fix:
  fetch-pack: buffer object-format with other args
maint
Junio C Hamano 4 years ago
parent
commit
6db01a7308
  1. 2
      fetch-pack.c

2
fetch-pack.c

@ -1251,7 +1251,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, @@ -1251,7 +1251,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
if (hash_algo_by_ptr(the_hash_algo) != hash_algo)
die(_("mismatched algorithms: client %s; server %s"),
the_hash_algo->name, hash_name);
packet_write_fmt(fd_out, "object-format=%s", the_hash_algo->name);
packet_buf_write(&req_buf, "object-format=%s", the_hash_algo->name);
} else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) {
die(_("the server does not support algorithm '%s'"),
the_hash_algo->name);

Loading…
Cancel
Save