This is two minor patches to improve the display of merge commits in the
graph output. The first fixes the "extra space" that appears sometimes,
as pointed out by Teemu Likonen. I had previously posted 2 simple
options for fixing the problem, but neither one was best in all cases.
This patch is an improved version that dynamically chooses how the merge
commit should be displayed, based on the last line of the previous
commit's output.
For example, with the new changes, the code now prints:
$ git log --graph --pretty=format:%h -10 8d6afc1
M 8d6afc1
|\
| M f2fea68
| |\
| M \ 21dbe12
| |\ \
M | \ \ 41094b8
|\ \ \ \
| M \ \ \ 061ad5f
| |\ \ \ \
| M \ \ \ \ fe041ad
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| M-. \ \ \ \ \ cd1333d
| |\ \ \ \ \ \ \
| | * | | | | | | cfcbd34
| | * | | | | | | 5398fed
| M | | | | | | | 539d84f
| |\ \ \ \ \ \ \ \
The second patch improves the output for octopus merges, by avoiding
printing unnecessary padding lines before the commit when there aren't
any existing branch lines to the right of the merge.
Adam Simpkins (2):
graph API: improve display of merge commits
graph API: avoid printing unnecessary padding before some octopus
merges
graph.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 101 insertions(+), 22 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
