summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <stolee@gmail.com>2019-05-21 09:59:53 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-28 10:39:49 -0700
commit1d8e31a3f63cbc8533bf763c6d4b89d8355769f0 (patch)
treedbaf6245d0a5eb2d531fc33eca635d3cc25036cb /git-mergetool.sh
parentrevision: use generation for A..B --topo-order queries (diff)
downloadtgif-1d8e31a3f63cbc8533bf763c6d4b89d8355769f0.tar.xz
revision: keep topo-walk free of unintersting commits
When updating the topo-order walk in b454241 (revision.c: generation-based topo-order algorithm, 2018-11-01), the logic was a huge rewrite of the walk logic. In that massive change, we accidentally included the UNINTERESTING commits in expand_topo_walk(). This means that a simple query like git rev-list --topo-order HEAD~1..HEAD will expand the topo walk for all commits reachable from HEAD, and not just one commit. This change should speed up these cases, but there is still a need for corrected commit-date for some A..B queries. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions