Skip to content

Commit

Permalink
Merge branch 'jc/bundle-complete-notice' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jul 11, 2012
2 parents cd733f4 + 8c3710f commit e49bf52
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions bundle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit e49bf52

Please sign in to comment.