From 71ba6b10f81ac8afcb0ba376f6691afe1269467c Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Thu, 7 Mar 2013 01:56:35 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- bundle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.c b/bundle.c index 8d12816b9d..65db53b6cb 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), -- 2.11.4.GIT