From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:06 +0000 (+0900)
Subject: Merge branch 'jk/drop-sha1-entry-pos' into maint
X-Git-Tag: v2.15.0-rc2~5^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c9375db0e3063cf2f20970ff9e36e720f823181;p=thirdparty%2Fgit.git

Merge branch 'jk/drop-sha1-entry-pos' into maint

Code clean-up.

* jk/drop-sha1-entry-pos:
  sha1-lookup: remove sha1_entry_pos() from header file
  sha1_file: drop experimental GIT_USE_LOOKUP search
---

7c9375db0e3063cf2f20970ff9e36e720f823181
diff --cc sha1_file.c
index 4fa4b185f3,85c28bdbdd..9008d6aa7b
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -2791,17 -2695,7 +2790,7 @@@ off_t find_pack_entry_one(const unsigne
  		printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
  		       sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
  
- 	if (use_lookup < 0)
- 		use_lookup = !!getenv("GIT_USE_LOOKUP");
- 	if (use_lookup) {
- 		int pos = sha1_entry_pos(index, stride, 0,
- 					 lo, hi, p->num_objects, sha1);
- 		if (pos < 0)
- 			return 0;
- 		return nth_packed_object_offset(p, pos);
- 	}
- 
 -	do {
 +	while (lo < hi) {
  		unsigned mi = (lo + hi) / 2;
  		int cmp = hashcmp(index + mi * stride, sha1);