From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:35 +0000 (+0900)
Subject: Merge branch 'jk/get-oid-indexed-object-name'
X-Git-Tag: v2.22.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8c59ba9a764f1ae1f8d176ea17c636183cfd7267?hp=-c

Merge branch 'jk/get-oid-indexed-object-name'

The codepath to parse :<path> that obtains the object name for an
indexed object has been made more robust.

* jk/get-oid-indexed-object-name:
get_oid: handle NULL repo->index
---

8c59ba9a764f1ae1f8d176ea17c636183cfd7267
diff --combined sha1-name.c
index b4f5cadae7,455e9fb1ea..728e6f1f61
--- a/sha1-name.c
+++ b/sha1-name.c
@@@ -157,9 -157,6 +157,9 @@@ static void unique_in_pack(struct packe
  	uint32_t num, i, first = 0;
  	const struct object_id *current = NULL;
  
 +	if (p->multi_pack_index)
 +		return;
 +
  	if (open_pack_index(p) || !p->num_objects)
  		return;
  
@@@ -628,9 -625,6 +628,9 @@@ static void find_abbrev_len_for_pack(st
  	struct object_id oid;
  	const struct object_id *mad_oid;
  
 +	if (p->multi_pack_index)
 +		return;
 +
  	if (open_pack_index(p) || !p->num_objects)
  		return;
  
@@@ -1843,7 -1837,7 +1843,7 @@@ static enum get_oid_result get_oid_with
  		if (flags & GET_OID_RECORD_PATH)
  			oc->path = xstrdup(cp);
  
- 		if (!repo->index->cache)
+ 		if (!repo->index || !repo->index->cache)
  			repo_read_index(repo);
  		pos = index_name_pos(repo->index, cp, namelen);
  		if (pos < 0)