diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:25:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:27:04 -0700 |
commit | ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78 (patch) | |
tree | ccc8afe7eb85ec89347047f8e3fb5ff7f4c2f6a6 /graph.c | |
parent | e0d48279d5a96bc02edac72c1d28fc38aed37c15 (diff) | |
parent | 4d8b32a2e1758236c4c1b714f179892e3bce982c (diff) | |
download | git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.gz |
Merge v1.7.5-rc2 into jn/format-patch-doc
This is to sync with the recent updates in Documentation/SubmittingPatches
and Documentation/format-patch.txt
Diffstat (limited to 'graph.c')
-rw-r--r-- | graph.c | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -798,22 +798,9 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb) } /* - * If revs->left_right is set, print '<' for commits that - * come from the left side, and '>' for commits from the right - * side. + * get_revision_mark() handles all other cases without assert() */ - if (graph->revs && graph->revs->left_right) { - if (graph->commit->object.flags & SYMMETRIC_LEFT) - strbuf_addch(sb, '<'); - else - strbuf_addch(sb, '>'); - return; - } - - /* - * Print '*' in all other cases - */ - strbuf_addch(sb, '*'); + strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit)); } /* |