summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Kevin Bracey <kevin@bracey.fi>2013-05-16 18:32:41 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-16 11:51:10 -0700
commit141efdba57b1769fc60ff9a3925afbc6af398faf (patch)
tree327e0be1f543a2c04219c27b3130aa80860bdeb8 /merge.c
parentrevision.c: don't show all merges for --parents (diff)
downloadtgif-141efdba57b1769fc60ff9a3925afbc6af398faf.tar.xz
revision.c: make default history consider bottom commits
Previously, the default history treated bottom commits the same as any other UNINTERESTING commit, which could force it down side branches. Consider the following history: *A--*B---D--*F * marks !TREESAME parent paths \ /* `-C-' When requesting "B..F", B is UNINTERESTING but TREESAME to D. C is !UNINTERESTING. So default following would go from D into the irrelevant side branch C to A, rather than to B. Note also that if there had been an extra !UNINTERESTING commit B1 between B and D, it wouldn't have gone down C. Change the default following to test relevant_commit() instead of !UNINTERESTING, so it can proceed straight from D to B, thus finishing the traversal of that path. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions