diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-03 15:03:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-03 15:03:05 -0700 |
| commit | 1e2574e5854e989f17d44f505f73278455b28eeb (patch) | |
| tree | 6d119a7ce6b96849436fda023e5980d2ce8c6a24 /bundle.c | |
| parent | The 14th batch (diff) | |
| parent | pack-objects: lazily set up "struct rev_info", don't leak (diff) | |
| download | git-1e2574e5854e989f17d44f505f73278455b28eeb.tar.gz git-1e2574e5854e989f17d44f505f73278455b28eeb.zip | |
Merge branch 'ds/partial-bundle-more' into ab/plug-leak-in-revisions
* ds/partial-bundle-more:
pack-objects: lazily set up "struct rev_info", don't leak
bundle: output hash information in 'verify'
bundle: move capabilities to end of 'verify'
pack-objects: parse --filter directly into revs.filter
pack-objects: move revs out of get_object_list()
list-objects-filter: remove CL_ARG__FILTER
Diffstat (limited to 'bundle.c')
| -rw-r--r-- | bundle.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -267,11 +267,6 @@ int verify_bundle(struct repository *r, (uintmax_t)r->nr); list_refs(r, 0, NULL); - if (header->filter.choice) { - printf_ln("The bundle uses this filter: %s", - list_objects_filter_spec(&header->filter)); - } - r = &header->prerequisites; if (!r->nr) { printf_ln(_("The bundle records a complete history.")); @@ -282,6 +277,12 @@ int verify_bundle(struct repository *r, (uintmax_t)r->nr); list_refs(r, 0, NULL); } + + printf_ln("The bundle uses this hash algorithm: %s", + header->hash_algo->name); + if (header->filter.choice) + printf_ln("The bundle uses this filter: %s", + list_objects_filter_spec(&header->filter)); } return ret; } |