Skip to content

Commit 7c1017d

Browse files
committed
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
2 parents a12816b + a02ffe0 commit 7c1017d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

bundle.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,17 @@ int verify_bundle(struct bundle_header *header, int verbose)
183183
struct ref_list *r;
184184

185185
r = &header->references;
186-
printf_ln(Q_("The bundle contains %d ref",
187-
"The bundle contains %d refs",
186+
printf_ln(Q_("The bundle contains this ref:",
187+
"The bundle contains these %d refs:",
188188
r->nr),
189189
r->nr);
190190
list_refs(r, 0, NULL);
191+
r = &header->prerequisites;
191192
if (!r->nr) {
192193
printf_ln(_("The bundle records a complete history."));
193194
} else {
194-
r = &header->prerequisites;
195-
printf_ln(Q_("The bundle requires this ref",
196-
"The bundle requires these %d refs",
195+
printf_ln(Q_("The bundle requires this ref:",
196+
"The bundle requires these %d refs:",
197197
r->nr),
198198
r->nr);
199199
list_refs(r, 0, NULL);

0 commit comments

Comments
 (0)