diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:02 -0700 |
| commit | 7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (patch) | |
| tree | 750121806e16db374abed6ecb711029fc7965d1e | |
| parent | Merge branch 'tk/doc-filter-branch' into maint-1.8.1 (diff) | |
| parent | bundle: Add colons to list headings in "verify" (diff) | |
| download | tgif-7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4.tar.xz | |
Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1
"git bundle verify" did not say "records a complete history" for a
bundle that does not have any prerequisites.
* 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); |