mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 14:08:16 +02:00
Code

Merge branch 'jc/bundle-complete-notice' into maint

Browse Source 
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:
Junio C Hamano 2012-07-11 12:44:50 -07:00
commit e49bf52a1a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundle.c
View File

@ -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;
}