summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2013-03-07 00:56:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-07 21:33:56 (GMT)
commit71ba6b10f81ac8afcb0ba376f6691afe1269467c (patch)
tree9a6485b8e349895540e4491f4601503e30d74131
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-71ba6b10f81ac8afcb0ba376f6691afe1269467c.zip
git-71ba6b10f81ac8afcb0ba376f6691afe1269467c.tar.gz
git-71ba6b10f81ac8afcb0ba376f6691afe1269467c.tar.bz2
bundle: Fix "verify" output if history is complete
A more informative message for "complete" bundles was added in commit 8c3710fd3011 (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>
-rw-r--r--bundle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle.c b/bundle.c
index 8d12816..65db53b 100644
--- a/bundle.c
+++ b/bundle.c
@@ -188,10 +188,10 @@ int verify_bundle(struct bundle_header *header, int verbose)
r->nr),
r->nr);
list_refs(r, 0, NULL);
+ r = &header->prerequisites;
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),