Merge branch 'jc/bundle-complete-notice' into maint
Running "git bundle verify" on a bundle that records a complete history said "it requires these 0 commits". * jc/bundle-complete-notice: tweak "bundle verify" of a complete history
This commit is contained in:
commit
e49bf52a1a
16
bundle.c
16
bundle.c
@ -188,12 +188,16 @@ int verify_bundle(struct bundle_header *header, int verbose)
|
||||
r->nr),
|
||||
r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
r = &header->prerequisites;
|
||||
printf_ln(Q_("The bundle requires this ref",
|
||||
"The bundle requires these %d refs",
|
||||
r->nr),
|
||||
r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
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",
|
||||
r->nr),
|
||||
r->nr);
|
||||
list_refs(r, 0, NULL);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user