]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/shift-root-in-graph' into jch
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2026 20:21:12 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2026 20:21:12 +0000 (13:21 -0700)
"git log --graph" has been modified to visually distinguish
parentless "root" commits (and commits that become roots due to
history simplification) by indenting them, preventing them from
appearing falsely related to unrelated commits rendered immediately
above them.

* ps/shift-root-in-graph:
  graph: indent visual root in graph
  revision: add peek functions for lookahead
  lib-log-graph: move check_graph function

1  2 
revision.c
revision.h
t/meson.build

diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge
diff --cc t/meson.build
index 0796dba2c4dcead197b400ba5d6c63e692e5f27f,17037a8465715f06216ecbccc4c320367f6e43bf..960836383ca71e284abf9d76738bf6000836de7a
@@@ -581,7 -576,7 +581,8 @@@ integration_tests = 
    't4215-log-skewed-merges.sh',
    't4216-log-bloom.sh',
    't4217-log-limit.sh',
+   't4218-log-graph-indentation.sh',
 +  't4219-log-follow-merge.sh',
    't4252-am-options.sh',
    't4253-am-keep-cr-dos.sh',
    't4254-am-corrupt.sh',