diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:21:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:21:09 -0700 |
| commit | a6da9cba6143ae65b4babe44892fd3fe0f9159fa (patch) | |
| tree | 46de228c3be4d04694162bfb4699a6ef3ec03531 | |
| parent | Merge branch 'jk/graph-c-expose-symbols-for-cgit' (diff) | |
| parent | bundle: Add colons to list headings in "verify" (diff) | |
| download | tgif-a6da9cba6143ae65b4babe44892fd3fe0f9159fa.tar.xz | |
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
| -rw-r--r-- | bundle.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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); |