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:
Junio C Hamano 2013-03-19 12:21:09 -07:00
commit a6da9cba61

View file

@ -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);