diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:35 (GMT) |
| commit | 8c59ba9a764f1ae1f8d176ea17c636183cfd7267 (patch) | |
| tree | 5d3ae1da7adb0f2003518b0a85633b23a995240c /sha1-name.c | |
| parent | bca6aba72e85b87142ae02a0ea2a486f9581ead4 (diff) | |
| parent | 581d2fd9f2d66ec5cb1859e0b6aef7c459a0d3a9 (diff) | |
| download | git-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.zip git-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.tar.gz git-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.tar.bz2 | |
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
Diffstat (limited to 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-name.c b/sha1-name.c index b4f5cad..728e6f1 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1843,7 +1843,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, 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) |