git/graph.c, branch v1.6.4

janitor: use NULL and not 0 for pointers.

2009-07-23T04:57:41Z

Brought to you thanks to coccinelle: ---8<---- @@ expression *E; @@ ( E == - 0 + NULL | E != - 0 + NULL | E = - 0 + NULL ) @@ identifier f; type T; @@ T *f(...) { <... - return 0; + return NULL; ...> } --->8---- There are a lot more hits in compat/nedmallox and compat/regex but these are borrowed code we rather do not want to maintain our own forks for, and this patch refrains from touching them. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Merge branch 'ac/graph-horizontal-line'

2009-05-18T15:59:30Z

* ac/graph-horizontal-line: graph API: Use horizontal lines for more compact graphs

Fix typos / spelling in comments

2009-04-23T02:02:12Z

Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano

graph API: Use horizontal lines for more compact graphs

2009-04-23T01:32:16Z

Use horizontal lines instead of long diagonal lines during the collapsing state of graph rendering. For example what used to be: | | | | | | | | |/ | | |/| | |/| | |/| | | | | | | is now | | | | | | |_|_|/ |/| | | | | | | This results in more compact and legible graphs. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

graph API: fix a bug in the rendering of octopus merges

2009-04-23T00:49:56Z

An off by one error was causing octopus merges with 3 parents to not be rendered correctly. This regression was introduced by 427fc5. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

graph API: fix extra space during pre_commit_line state

2009-04-23T00:48:42Z

An extra space is being inserted between the "commit" column and all of the successive edges. Remove this space. This regression was introduced by 427fc5b. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

graph API: Added logic for colored edges

2009-04-14T05:41:25Z

Modified the graph drawing logic to colorize edges based on parent-child relationships similiarly to gitk. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

2008-10-12T19:36:19Z

Many call sites use strbuf_init(&foo, 0) to initialize local strbuf variable "foo" which has not been accessed since its declaration. These can be replaced with a static initialization using the STRBUF_INIT macro which is just as readable, saves a function call, and takes up fewer lines. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

graph.c: make many functions static

2008-09-25T15:00:28Z

These function are not used anywhere. Also removes graph_release() that is never called. Signed-off-by: Nanako Shiraishi Signed-off-by: Shawn O. Pearce

git log --graph: print '*' for all commits, including merges

2008-06-06T18:56:43Z

Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano