mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
Merge branch 'lf/bundle-verify-list-prereqs'
* lf/bundle-verify-list-prereqs: bundle: Add colons to list headings in "verify" bundle: Fix "verify" output if history is complete
This commit is contained in:
commit
a6da9cba61
1 changed files with 5 additions and 5 deletions
10
bundle.c
10
bundle.c
|
@ -183,17 +183,17 @@ int verify_bundle(struct bundle_header *header, int verbose)
|
|||
struct ref_list *r;
|
||||
|
||||
r = &header->references;
|
||||
printf_ln(Q_("The bundle contains %d ref",
|
||||
"The bundle contains %d refs",
|
||||
printf_ln(Q_("The bundle contains this ref:",
|
||||
"The bundle contains these %d refs:",
|
||||
r->nr),
|
||||
r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
r = &header->prerequisites;
|
||||
if (!r->nr) {
|
||||
printf_ln(_("The bundle records a complete history."));
|
||||
} else {
|
||||
r = &header->prerequisites;
|
||||
printf_ln(Q_("The bundle requires this ref",
|
||||
"The bundle requires these %d refs",
|
||||
printf_ln(Q_("The bundle requires this ref:",
|
||||
"The bundle requires these %d refs:",
|
||||
r->nr),
|
||||
r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
|
|
Loading…
Reference in a new issue