git, branch v2.25.0-rc2

Git 2.25-rc2

2020-01-08T20:44:13Z

Signed-off-by: Junio C Hamano

Merge branch 'ds/graph-assert-fix'

2020-01-08T20:44:13Z

Since recent updates to the log graph rendering code, drawing certain merges started triggering an assert on a condition that would no longer hold true, which has been corrected. * ds/graph-assert-fix: graph: fix lack of color in horizontal lines graph: drop assert() for merge with two collapsing parents

Merge branch 'tm/doc-submodule-absorb-fix'

2020-01-08T20:44:12Z

Typofix. * tm/doc-submodule-absorb-fix: doc: submodule: fix typo for command absorbgitdirs

Merge branch 'pm/am-in-body-header-doc-update'

2020-01-08T20:44:12Z

Doc update. * pm/am-in-body-header-doc-update: am: document that Date: can appear as an in-body header

Merge branch 'jb/doc-multi-pack-idx-fix'

2020-01-08T20:44:12Z

Typofix. * jb/doc-multi-pack-idx-fix: multi-pack-index: correct configuration in documentation

Merge branch 'do/gitweb-typofix-in-comments'

2020-01-08T20:44:11Z

Typofix. * do/gitweb-typofix-in-comments: gitweb: fix a couple spelling errors in comments

Merge https://github.com/prati0100/git-gui

2020-01-08T19:18:06Z

* https://github.com/prati0100/git-gui: git-gui: allow opening currently selected file in default app git-gui: allow closing console window with Escape git gui: fix branch name encoding error git-gui: revert untracked files by deleting them git-gui: update status bar to track operations git-gui: consolidate naming conventions

graph: fix lack of color in horizontal lines

2020-01-08T17:37:18Z

In some cases, horizontal lines in rendered graphs can lose their coloring. This is due to a use of graph_line_addch() instead of graph_line_write_column(). Using a ternary operator to pick the character is nice for compact code, but we actually need a column to provide the color. Add a test to t4215-log-skewed-merges.sh to prevent regression. Reported-by: Jeff King Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

graph: drop assert() for merge with two collapsing parents

2020-01-08T17:35:07Z

When "git log --graph" shows a merge commit that has two collapsing lines, like: | | | | * | |_|_|/| |/| | |/ | | |/| | |/| | | * | | * | | | we trigger an assert(): graph.c:1228: graph_output_collapsing_line: Assertion `graph->mapping[i - 3] == target' failed. The assert was introduced by eaf158f8 ("graph API: Use horizontal lines for more compact graphs", 2009-04-21), which is quite old. This assert is trying to say that when we complete a horizontal line with a single slash, it is because we have reached our target. It is actually the _second_ collapsing line that hits this assert. The reason we are in this code path is because we are collapsing the first line, and in that case we are hitting our target now that the horizontal line is complete. However, the second line cannot be a horizontal line, so it will collapse without horizontal lines. In this case, it is inappropriate to assert that we have reached our target, as we need to continue for another column before reaching the target. Dropping the assert is safe here. The new behavior in 0f0f389f12 (graph: tidy up display of left-skewed merges, 2019-10-15) caused the behavior change that made this assertion failure possible. In addition to making the assert possible, it also changed how multiple edges collapse. In a larger example, the current code will output a collapse as follows: | | | | | | * | |_|_|_|_|/|\ |/| | | | |/ / | | | | |/| / | | | |/| |/ | | |/| |/| | |/| |/| | | | |/| | | | | * | | | However, the intended collapse should allow multiple horizontal lines as follows: | | | | | | * | |_|_|_|_|/|\ |/| | | | |/ / | | |_|_|/| / | |/| | | |/ | | | |_|/| | | |/| | | | | * | | | This behavior is not corrected by this change, but is noted for a later update. Helped-by: Jeff King Reported-by: Bradley Smith Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

The final batch before -rc2

2020-01-06T22:17:51Z

Signed-off-by: Junio C Hamano