summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar Taylor Blau <me@ttaylorr.com>2020-04-13 22:04:04 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-15 09:20:24 -0700
commit2fa05f31bd95eed34d6e8848b6b1e6265674f50a (patch)
tree3937e5487f27e6bcfdf326850ea6b7b368843d00 /mergetools/ecmerge
parentcommit-graph.h: use odb in 'load_commit_graph_one_fd_st' (diff)
downloadtgif-2fa05f31bd95eed34d6e8848b6b1e6265674f50a.tar.xz
t/helper/test-read-graph.c: support commit-graph chains
In 61df89c8e5 (commit-graph: don't early exit(1) on e.g. "git status", 2019-03-25), the former 'load_commit_graph_one' was refactored into 'open_commit_graph' and 'load_commit_graph_one_fd_st' as a means of avoiding an early-exit from non-library code. However, 'load_commit_graph_one' does not support commit-graph chains, and hence the 'read-graph' test tool does not work with them. Replace 'load_commit_graph_one' with 'read_commit_graph_one' in order to support commit-graph chains. In the spirit of 61df89c8e5, 'read_commit_graph_one' does not ever 'die()', making it a suitable replacement here. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions