summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 20:46:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-25 20:46:02 (GMT)
commit7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (patch)
tree750121806e16db374abed6ecb711029fc7965d1e /bundle.c
parenta12816b7dc17f36ce6b6fad692da7197532c1ef4 (diff)
parenta02ffe0e1a19c9594af3e81f4e04b46eabe4755a (diff)
downloadgit-7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4.zip
git-7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4.tar.gz
git-7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4.tar.bz2
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
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bundle.c b/bundle.c
index 8d12816..6210a6b 100644
--- a/bundle.c
+++ b/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);