From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:03:02 +0000 (+0900)
Subject: Merge branch 'rs/find-pack-entry-bisection' into maint
X-Git-Tag: v2.14.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c580ce194fc1a62b676190a3300fde4c6ba58380?hp=c7759cd60ab0213024c3fbe9a163dcd49b2bb838

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

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 b7bb38b445..4c4a1f1ea3 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2800,7 +2800,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 		return nth_packed_object_offset(p, pos);
 	}
 
-	do {
+	while (lo < hi) {
 		unsigned mi = (lo + hi) / 2;
 		int cmp = hashcmp(index + mi * stride, sha1);
 
@@ -2813,7 +2813,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 			hi = mi;
 		else
 			lo = mi+1;
-	} while (lo < hi);
+	}
 	return 0;
 }