commit 04284d5dc05ec467c10c7f4adc727769c664c16aaf6ea9a96d5f7ec9ca59009c from: Omar Polo via: Stefan Sperling date: Wed May 20 19:59:27 2026 UTC revert chunk; match object-format in gitproto match_capability unbreaks send commit - 7d4ae36f214d9221227adf259583884af482804807229b606facbca07cc46684 commit + 04284d5dc05ec467c10c7f4adc727769c664c16aaf6ea9a96d5f7ec9ca59009c blob - 72ed8fc95937238a6e5ecfe15cfceb0e22323536aa15b32455153da454c33f14 blob + f2008543b6779bc1161d5dcc1f844373f8e699ed2ebafea3650584792db18c3d --- lib/gitproto.c +++ lib/gitproto.c @@ -232,7 +232,7 @@ got_gitproto_parse_ref_update_line(char **old_id_str, static const struct got_error * match_capability(char **my_capabilities, const char *capa, - const struct got_capability *mycapa) + const struct got_capability *mycapa, enum got_hash_algorithm *algo) { char *equalsign; char *s; @@ -241,6 +241,17 @@ match_capability(char **my_capabilities, const char *c if (equalsign) { if (strncmp(capa, mycapa->key, equalsign - capa) != 0) return NULL; + + if (strcmp(mycapa->key, GOT_CAPA_OBJECT_FORMAT) == 0) { + /* require an exact match on object-format value */ + if (strcmp(equalsign + 1, mycapa->value) != 0) + return NULL; + + if (strcmp(mycapa->value, GOT_CAPA_OBJECT_FORMAT_SHA256) + == 0) + *algo = GOT_HASH_SHA256; + } + } else { if (strcmp(capa, mycapa->key) != 0) return NULL; @@ -322,18 +333,9 @@ got_gitproto_match_capabilities(char **common_capabili continue; } - if (equalsign != NULL && - strncmp(capa, GOT_CAPA_OBJECT_FORMAT, - equalsign - capa) == 0) { - if (strcmp(equalsign + 1, - GOT_CAPA_OBJECT_FORMAT_SHA256) == 0) - *algo = GOT_HASH_SHA256; - continue; - } - for (i = 0; i < ncapa; i++) { err = match_capability(common_capabilities, - capa, &my_capabilities[i]); + capa, &my_capabilities[i], algo); if (err) break; } blob - 649304787a4a2553a1d162325d7d2e573e3a4457a2bf5e7b33658e8d771cd7d7 blob + e7ef61065d720edb503d9df725de915672306f187a506355428cb4922a3e48ff --- libexec/got-fetch-pack/got-fetch-pack.c +++ libexec/got-fetch-pack/got-fetch-pack.c @@ -438,20 +438,6 @@ fetch_pack(int fd, int packfd, int expected_algo, goto done; } - if (algo == GOT_HASH_SHA256) { - char *s; - - if (asprintf(&s, "%s%s%s=%s", my_capabilities, - my_capabilities[0] != '\0' ? " " : "", - GOT_CAPA_OBJECT_FORMAT, - GOT_CAPA_OBJECT_FORMAT_SHA256) == -1) { - err = got_error_from_errno("asprintf"); - goto done; - } - free(my_capabilities); - my_capabilities = s; - } - if (chattygot) fprintf(stderr, "%s: my capabilities:%s\n", getprogname(), my_capabilities != NULL ?