eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 21:33:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sb/bundle-uri-without-uri' into jch

Browse Source 
Diagnose invalid bundle-URI that lack the URI entry, instead of
crashing.

* sb/bundle-uri-without-uri:
  bundle-uri: validate that bundle entries have a uri
This commit is contained in:
Junio C Hamano 2026-01-09 06:49:45 -08:00
commit 87c8ccb2b5
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bundle-uri.c
View File

@ -89,7 +89,10 @@ static int summarize_bundle(struct remote_bundle_info *info, void *data)
{
FILE *fp = data;
fprintf(fp, "[bundle \"%s\"]\n", info->id);
fprintf(fp, "\turi = %s\n", info->uri);
if (info->uri)
fprintf(fp, "\turi = %s\n", info->uri);
else
fprintf(fp, "\t# uri = (missing)\n");
if (info->creationToken)
fprintf(fp, "\tcreationToken = %"PRIu64"\n", info->creationToken);
@ -267,6 +270,19 @@ int bundle_uri_parse_config_format(const char *uri,
result = 1;
}
if (!result) {
struct hashmap_iter iter;
struct remote_bundle_info *bundle;
hashmap_for_each_entry(&list->bundles, &iter, bundle, ent) {
if (!bundle->uri) {
error(_("bundle list at '%s': bundle '%s' has no uri"),
uri, bundle->id ? bundle->id : "<unknown>");
result = 1;
}
}
}
return result;
}
@ -751,6 +767,12 @@ static int fetch_bundle_uri_internal(struct repository *r,
return -1;
}
if (!bundle->uri) {
error(_("bundle '%s' has no uri"),
bundle->id ? bundle->id : "<unknown>");
return -1;
}
if (!bundle->file &&
!(bundle->file = find_temp_filename())) {
result = -1;

26
t/t5750-bundle-uri-parse.sh
View File

@ -286,4 +286,30 @@ test_expect_success 'parse config format edge cases: creationToken heuristic' '
grep "could not parse bundle list key creationToken with value '\''bogus'\''" err
'
test_expect_success 'parse config format: bundle with missing uri' '
cat >input <<-\EOF &&
[bundle]
version = 1
mode = all
[bundle "missing-uri"]
creationToken = 1
EOF
test_must_fail test-tool bundle-uri parse-config input 2>err &&
grep "bundle '\''missing-uri'\'' has no uri" err
'
test_expect_success 'parse config format: bundle with url instead of uri' '
cat >input <<-\EOF &&
[bundle]
version = 1
mode = all
[bundle "typo"]
url = https://example.com/bundle.bdl
EOF
test_must_fail test-tool bundle-uri parse-config input 2>err &&
grep "bundle '\''typo'\'' has no uri" err
'
test_done