mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lf/bundle-verify-list-prereqs'

Browse Source 
* 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
parent c278e6f53d a02ffe0e1a
commit a6da9cba61
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bundle.c
View File

@ -183,17 +183,17 @@ int verify_bundle(struct bundle_header *header, int verbose)
struct ref_list *r; struct ref_list *r;
r = &header->references; r = &header->references;
printf_ln(Q_("The bundle contains %d ref", printf_ln(Q_("The bundle contains this ref:",
"The bundle contains %d refs", "The bundle contains these %d refs:",
r->nr), r->nr),
r->nr); r->nr);
list_refs(r, 0, NULL); list_refs(r, 0, NULL);
r = &header->prerequisites;
if (!r->nr) { if (!r->nr) {
printf_ln(_("The bundle records a complete history.")); printf_ln(_("The bundle records a complete history."));
} else { } else {
r = &header->prerequisites; printf_ln(Q_("The bundle requires this ref:",
printf_ln(Q_("The bundle requires this ref", "The bundle requires these %d refs:",
"The bundle requires these %d refs",
r->nr), r->nr),
r->nr); r->nr);
list_refs(r, 0, NULL); list_refs(r, 0, NULL);