From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Aug 2017 21:13:07 +0000 (-0700)
Subject: Merge branch 'jt/sha1-file-cleanup'
X-Git-Tag: v2.15.0-rc0~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fa2a4bba2cc60bde49d5a64b4df6ae6d36cfa044?ds=inline;hp=-c

Merge branch 'jt/sha1-file-cleanup'

Preparatory code clean-up.

* jt/sha1-file-cleanup:
sha1_file: remove read_packed_sha1()
sha1_file: set whence in storage-specific info fn
---

fa2a4bba2cc60bde49d5a64b4df6ae6d36cfa044
diff --combined sha1_file.c
index 81d03ce859,0f758eabfd..79feb1a305
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -2444,6 -2444,9 +2444,9 @@@ int packed_object_info(struct packed_gi
  			hashclr(oi->delta_base_sha1);
  	}
  
+ 	oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
+ 							  OI_PACKED;
+ 
  out:
  	unuse_pack(&w_curs);
  	return type;
@@@ -2542,8 -2545,8 +2545,8 @@@ void *unpack_entry(struct packed_git *p
  				error("bad packed object CRC for %s",
  				      sha1_to_hex(sha1));
  				mark_bad_packed_object(p, sha1);
 -				unuse_pack(&w_curs);
 -				return NULL;
 +				data = NULL;
 +				goto out;
  			}
  		}
  
@@@ -2681,7 -2684,6 +2684,7 @@@
  	if (final_size)
  		*final_size = size;
  
 +out:
  	unuse_pack(&w_curs);
  
  	if (delta_stack != small_delta_stack)
@@@ -2760,6 -2762,7 +2763,6 @@@ off_t find_pack_entry_one(const unsigne
  	const uint32_t *level1_ofs = p->index_data;
  	const unsigned char *index = p->index_data;
  	unsigned hi, lo, stride;
 -	static int use_lookup = -1;
  	static int debug_lookup = -1;
  
  	if (debug_lookup < 0)
@@@ -2789,7 -2792,17 +2792,7 @@@
  		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);
  
@@@ -2802,7 -2815,7 +2805,7 @@@
  			hi = mi;
  		else
  			lo = mi+1;
 -	} while (lo < hi);
 +	}
  	return 0;
  }
  
@@@ -2963,6 -2976,7 +2966,7 @@@ static int sha1_loose_object_info(cons
  	if (oi->sizep == &size_scratch)
  		oi->sizep = NULL;
  	strbuf_release(&hdrbuf);
+ 	oi->whence = OI_LOOSE;
  	return (status < 0) ? status : 0;
  }
  
@@@ -3000,10 -3014,8 +3004,8 @@@ int sha1_object_info_extended(const uns
  
  	if (!find_pack_entry(real, &e)) {
  		/* Most likely it's a loose object. */
- 		if (!sha1_loose_object_info(real, oi, flags)) {
- 			oi->whence = OI_LOOSE;
+ 		if (!sha1_loose_object_info(real, oi, flags))
  			return 0;
- 		}
  
  		/* Not a loose object; someone else may have just packed it. */
  		if (flags & OBJECT_INFO_QUICK) {
@@@ -3026,10 -3038,7 +3028,7 @@@
  	if (rtype < 0) {
  		mark_bad_packed_object(e.p, real);
  		return sha1_object_info_extended(real, oi, 0);
- 	} else if (in_delta_base_cache(e.p, e.offset)) {
- 		oi->whence = OI_DBCACHED;
- 	} else {
- 		oi->whence = OI_PACKED;
+ 	} else if (oi->whence == OI_PACKED) {
  		oi->u.packed.offset = e.offset;
  		oi->u.packed.pack = e.p;
  		oi->u.packed.is_delta = (rtype == OBJ_REF_DELTA ||
@@@ -3053,30 -3062,6 +3052,6 @@@ int sha1_object_info(const unsigned cha
  	return type;
  }
  
- static void *read_packed_sha1(const unsigned char *sha1,
- 			      enum object_type *type, unsigned long *size)
- {
- 	struct pack_entry e;
- 	void *data;
- 
- 	if (!find_pack_entry(sha1, &e))
- 		return NULL;
- 	data = cache_or_unpack_entry(e.p, e.offset, size, type);
- 	if (!data) {
- 		/*
- 		 * We're probably in deep shit, but let's try to fetch
- 		 * the required object anyway from another pack or loose.
- 		 * This should happen only in the presence of a corrupted
- 		 * pack, and is better than failing outright.
- 		 */
- 		error("failed to read object %s at offset %"PRIuMAX" from %s",
- 		      sha1_to_hex(sha1), (uintmax_t)e.offset, e.p->pack_name);
- 		mark_bad_packed_object(e.p, sha1);
- 		data = read_object(sha1, type, size);
- 	}
- 	return data;
- }
- 
  int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
  		      unsigned char *sha1)
  {
@@@ -3459,7 -3444,7 +3434,7 @@@ int force_object_loose(const unsigned c
  
  	if (has_loose_object(sha1))
  		return 0;
- 	buf = read_packed_sha1(sha1, &type, &len);
+ 	buf = read_object(sha1, &type, &len);
  	if (!buf)
  		return error("cannot read sha1_file for %s", sha1_to_hex(sha1));
  	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), len) + 1;