git/graph.c, branch v2.6.2

Merge branch 'rs/graph-simplify'

2014-09-29T19:36:11Z

* rs/graph-simplify: graph: simplify graph_padding_line()

Merge branch 'rs/realloc-array'

2014-09-26T21:39:45Z

Code cleanup. * rs/realloc-array: use REALLOC_ARRAY for changing the allocation size of arrays add macro REALLOC_ARRAY

graph: simplify graph_padding_line()

2014-09-22T19:39:57Z

Deduplicate code common to both branches of if statements. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

use REALLOC_ARRAY for changing the allocation size of arrays

2014-09-18T16:13:42Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

strbuf: use strbuf_addchars() for adding a char multiple times

2014-09-08T18:26:48Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

graph: fix coloring around octopus merges

2013-10-18T19:48:48Z

When drawing the graph of an octopus merge, we draw a horizontal line from parents 3 and above into the asterisk representing the commit. The sections of this line should be colored to match the graph lines coming in from above. However, if the commit is not in the left-most column we do not take into account the columns to the left of the commit when calculating these colors. Fix this by adding the appropriate offset to the column index used for calculating the color. Signed-off-by: Hemmo Nieminen Signed-off-by: Junio C Hamano

Revert "graph.c: mark private file-scope symbols as static"

2013-03-04T03:43:54Z

This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb. CGit uses these symbols to output the correct HTML around graph elements. Making these symbols private means that CGit cannot be updated to use Git 1.8.0 or newer, so let's not do that. On top of the revert, also add comments so that we avoid reintroducing this problem in the future and suggest to those modifying this API that they might want to discuss it with the CGit developers. Signed-off-by: John Keeping Acked-by: Jason A. Donenfeld Acked-by: Johan Herland Signed-off-by: Junio C Hamano

graph: output padding for merge subsequent parents

2013-02-07T20:54:26Z

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 Signed-off-by: Junio C Hamano

Merge branch 'mk/maint-graph-infinity-loop' into maint

2013-01-14T15:32:18Z

* mk/maint-graph-infinity-loop: graph.c: infinite loop in git whatchanged --graph -m

graph.c: infinite loop in git whatchanged --graph -m

2012-09-25T18:07:15Z

Running "whatchanged --graph -m" on a simple two-head merges can fall into infinite loop. Signed-off-by: Michał Kiedrowicz Signed-off-by: Junio C Hamano