From: Milton Soares Filho <milton.soares.filho@gmail.com>
To: git@vger.kernel.org
Cc: Milton Soares Filho <milton.soares.filho@gmail.com>
Subject: [PATCH] graph.c: visual difference on subsequent series
Date: Fri, 25 Oct 2013 14:07:48 -0200 [thread overview]
Message-ID: <1382717268-21884-1-git-send-email-milton.soares.filho@gmail.com> (raw)
For projects with separate history lines and, thus, multiple root-commits, the
linear arrangement of `git log --graph --oneline` does not allow the user to
spot where the sequence ends, giving the impression that it's a contiguous
history. E.g.
History sequence A: a1 -- a2 -- a3 (root-commit)
History sequence B: b1 -- b2 -- b3 (root-commit)
git log --graph --oneline
* a1
* a2
* a3
* b1
* b2
* b3
In a GUI tool, the root-commit of each series would stand out on the graph.
This modification changes the commit char to a different symbol ('x'), so users
of the command-line graph tool can easily identify root-commits and make sense
of where each series is limited to.
git log --graph --oneline
* a1
* a2
x a3
* b1
* b2
x b3
Signed-off-by: Milton Soares Filho <milton.soares.filho@gmail.com>
---
graph.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/graph.c b/graph.c
index b24d04c..ec8e960 100644
--- a/graph.c
+++ b/graph.c
@@ -780,6 +780,15 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
}
/*
+ * Out-stand parentless commits to enforce non-continuity on subsequent
+ * but separate series
+ */
+ if (graph->commit->parents == NULL) {
+ strbuf_addch(sb, 'x');
+ return;
+ }
+
+ /*
* get_revision_mark() handles all other cases without assert()
*/
strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit));
--
1.8.1.2
next reply other threads:[~2013-10-25 16:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-25 16:07 Milton Soares Filho [this message]
2013-10-25 17:13 ` [PATCH] graph.c: visual difference on subsequent series Junio C Hamano
2013-10-25 20:49 ` Milton Soares Filho
2013-10-26 2:37 ` Keshav Kini
2013-10-28 15:41 ` Junio C Hamano
2013-10-28 16:59 ` Keshav Kini
2013-10-28 17:18 ` Milton Soares Filho
2013-10-28 17:39 ` Junio C Hamano
2013-12-20 20:22 ` [RFH/PATCH] graph: give an extra gap after showing root commit Junio C Hamano
2013-12-20 22:03 ` Junio C Hamano
2014-01-03 20:16 ` Thomas Rast
-- strict thread matches above, loose matches on Subject: below --
2013-10-25 20:51 [PATCH] graph.c: visual difference on subsequent series Milton Soares Filho
2014-11-10 13:33 Antoine Beaupré
2015-07-27 19:37 ` Antoine Beaupré
2015-07-27 20:17 ` Junio C Hamano
2015-09-03 8:04 ` Michael J Gruber
2015-09-03 17:13 ` Junio C Hamano
2015-09-04 14:07 ` Michael J Gruber
2015-09-04 16:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382717268-21884-1-git-send-email-milton.soares.filho@gmail.com \
--to=milton.soares.filho@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).