undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle: Fix "verify" output if history is complete

Browse Source 
A more informative message for "complete" bundles was added in commit
8c3710fd30 (tweak "bundle verify" of a complete history, 2012-06-04).

However, the prerequisites ref list is currently read *after* we
check if it equals zero, which means we never actually use the
number of prerequisite refs to decide when to print the newly
introduced message.  The code incorrectly uses the number of
references recorded in the bundle instead.

Signed-off-by: Lukas Fleischer <git@cryptocrack.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lukas Fleischer 2013-03-07 01:56:35 +01:00 committed by Junio C Hamano
parent 7e2010537e
commit 71ba6b10f8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundle.c
View File

@ -188,10 +188,10 @@ int verify_bundle(struct bundle_header *header, int verbose)
r->nr), r->nr),
r->nr); r->nr);
list_refs(r, 0, NULL); list_refs(r, 0, NULL);
r = &header->prerequisites;
if (!r->nr) { if (!r->nr) {
printf_ln(_("The bundle records a complete history.")); printf_ln(_("The bundle records a complete history."));
} else { } else {
r = &header->prerequisites;
printf_ln(Q_("The bundle requires this ref", printf_ln(Q_("The bundle requires this ref",
"The bundle requires these %d refs", "The bundle requires these %d refs",
r->nr), r->nr),