Merge branch 'jc/log-graph-simplify'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:28 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:28 +0000 (09:04 -0800)
commit0be5caf97ce1ad5f3c10ac00875f9aaf4939339d
treea0c75fa674ccf24148004d8c98f415c058511c18
parent0e07c1cd83535cf3a20d3d961a41bb4a627ce4e5
parentd784d978f68219774270f92f3672e0e064602c09
Merge branch 'jc/log-graph-simplify'

The implementation of "git log --graph" got refactored and then its
output got simplified.

* jc/log-graph-simplify:
  t4215: use helper function to check output
  graph: fix coloring of octopus dashes
  graph: flatten edges that fuse with their right neighbor
  graph: smooth appearance of collapsing edges on commit lines
  graph: rename `new_mapping` to `old_mapping`
  graph: commit and post-merge lines for left-skewed merges
  graph: tidy up display of left-skewed merges
  graph: example of graph output that can be simplified
  graph: extract logic for moving to GRAPH_PRE_COMMIT state
  graph: remove `mapping_idx` and `graph_update_width()`
  graph: reduce duplication in `graph_insert_into_new_columns()`
  graph: reuse `find_new_column_by_commit()`
  graph: handle line padding in `graph_next_line()`
  graph: automatically track display width of graph lines