summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorAdam Simpkins <adam@adamsimpkins.net>2008-06-05 09:28:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-06 18:56:43 (GMT)
commit03300c0ac0dfd6098ff65cff518bfffb05ae4194 (patch)
treeaa135fde48446e06a36ff6b3f66f826db73e1190 /graph.c
parent1b9a9467f8b9a8da2fe58d10ae16779492aa7737 (diff)
downloadgit-03300c0ac0dfd6098ff65cff518bfffb05ae4194.zip
git-03300c0ac0dfd6098ff65cff518bfffb05ae4194.tar.gz
git-03300c0ac0dfd6098ff65cff518bfffb05ae4194.tar.bz2
git log --graph: print '*' for all commits, including merges
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 <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/graph.c b/graph.c
index 283b137..e2633f8 100644
--- a/graph.c
+++ b/graph.c
@@ -680,20 +680,6 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
}
/*
- * Print 'M' for merge commits
- *
- * Note that we don't check graph->num_parents to determine if the
- * commit is a merge, since that only tracks the number of
- * "interesting" parents. We want to print 'M' for merge commits
- * even if they have less than 2 interesting parents.
- */
- if (graph->commit->parents != NULL &&
- graph->commit->parents->next != NULL) {
- strbuf_addch(sb, 'M');
- return;
- }
-
- /*
* Print '*' in all other cases
*/
strbuf_addch(sb, '*');