From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 17:29:11 +0000 (-0700)
Subject: Merge branch 'rs/find-pack-entry-bisection'
X-Git-Tag: v2.15.0-rc0~164
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3717f91c5a1afd45b15e255d6dc38431b020f8bf?hp=1168df9a9c1134b3041c0ffb1f8019a88f51cdb5

Merge branch 'rs/find-pack-entry-bisection'

Code clean-up.

* rs/find-pack-entry-bisection:
sha1_file: avoid comparison if no packed hash matches the first byte
---

diff --git a/sha1_file.c b/sha1_file.c
index ccf6fcf4ec..607b34ea53 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2788,7 +2788,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 		printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
 		       sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
 
-	do {
+	while (lo < hi) {
 		unsigned mi = (lo + hi) / 2;
 		int cmp = hashcmp(index + mi * stride, sha1);
 
@@ -2801,7 +2801,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 			hi = mi;
 		else
 			lo = mi+1;
-	} while (lo < hi);
+	}
 	return 0;
 }