diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2018-05-01 12:47:13 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 12:36:34 +0900 |
commit | e2838d85b6d35592ff5851d67f0232a78083ada7 (patch) | |
tree | 64145e0fd535978aa7839440c0beff6c06531522 /Documentation/git-merge-one-file.txt | |
parent | commit: use generations in paint_down_to_common() (diff) | |
download | tgif-e2838d85b6d35592ff5851d67f0232a78083ada7.tar.xz |
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 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions