[PATCH 1/2] bundle: Fix "verify" output if history is complete

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



A more informative message for "complete" bundles was added in commit
8c3710fd. However, the prerequisites ref list is currently read *after*
we check if it equals zero, which means we never actually print the
newly introduced message.

Move the code that reads the prerequisites ref list before the check to
fix this.

Signed-off-by: Lukas Fleischer <git@xxxxxxxxxxxxxx>
---
I am not sure whether we should add a test case for such a simple "bug".
If you think we should, just let me know and I will add one.

 bundle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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),
-- 
1.8.2.rc2.352.g908df73

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]