summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-05-01 12:47:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-22 03:36:34 (GMT)
commite2838d85b6d35592ff5851d67f0232a78083ada7 (patch)
tree64145e0fd535978aa7839440c0beff6c06531522 /object.c
parent3afc679b3c13d99e4f02bceb686f11d51576d3ae (diff)
downloadgit-e2838d85b6d35592ff5851d67f0232a78083ada7.zip
git-e2838d85b6d35592ff5851d67f0232a78083ada7.tar.gz
git-e2838d85b6d35592ff5851d67f0232a78083ada7.tar.bz2
commit-graph: always load commit-graph information
Most code paths load commits using lookup_commit() and then parse_commit(). In some cases, including some branch lookups, the commit is parsed using parse_object_buffer() which side-steps parse_commit() in favor of parse_commit_buffer(). With generation numbers in the commit-graph, we need to ensure that any commit that exists in the commit-graph file has its generation number loaded. Create new load_commit_graph_info() method to fill in the information for a commit that exists only in the commit-graph file. Call it from parse_commit_buffer() after loading the other commit information from the given buffer. Only fill this information when specified by the 'check_graph' parameter. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
-rw-r--r--object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.c b/object.c
index e6ad3f6..efe4871 100644
--- a/object.c
+++ b/object.c
@@ -207,7 +207,7 @@ struct object *parse_object_buffer(const struct object_id *oid, enum object_type
} else if (type == OBJ_COMMIT) {
struct commit *commit = lookup_commit(oid);
if (commit) {
- if (parse_commit_buffer(commit, buffer, size))
+ if (parse_commit_buffer(commit, buffer, size, 1))
return NULL;
if (!get_cached_commit_buffer(commit, NULL)) {
set_commit_buffer(commit, buffer, size);