| commit | a48ec2415882ae15b8593185d6f9ab2f69555a9d | |
| author | John Keeping <john@keeping.me.uk> | |
| Thu, 7 Feb 2013 20:15:23 +0000 (7 20:15 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Feb 2013 20:54:26 +0000 (7 12:54 -0800) | ||
| tree | adaf41c2629490ecc1cc4d689cce755c3dbfff40 | treesnapshot (tar.gz zip) |
| parent | 42f50f8d0150605ab4da32d283cef2df0bcb51ab | commitdiff |
graph: output padding for merge subsequent parents
When showing merges in git-log, the same commit is shown once for each
parent. Combined with "--graph" this results in graph_show_commit()
being called once for each parent without graph_update() being called.
Currently graph_show_commit() does not print anything on subsequent
invocations for the same commit (this was changed by commit 656197a -
"graph.c: infinite loop in git whatchanged --graph -m" from the previous
behaviour of looping infinitely).
Change this so that if the graph code believes it has already shown the
commit it prints a single padding line.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When showing merges in git-log, the same commit is shown once for each
parent. Combined with "--graph" this results in graph_show_commit()
being called once for each parent without graph_update() being called.
Currently graph_show_commit() does not print anything on subsequent
invocations for the same commit (this was changed by commit 656197a -
"graph.c: infinite loop in git whatchanged --graph -m" from the previous
behaviour of looping infinitely).
Change this so that if the graph code believes it has already shown the
commit it prints a single padding line.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| graph.c | diffblobblamehistory |