From: Bo Yang <struggleyb.nku@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, trast@student.ethz.ch, peff@peff.net
Subject: [PATCH 2/6 v3] Output the graph columns at the end of the commit message.
Date: Thu, 20 May 2010 18:52:40 -0700 [thread overview]
Message-ID: <1274406764-32278-3-git-send-email-struggleyb.nku@gmail.com> (raw)
In-Reply-To: <1274406764-32278-2-git-send-email-struggleyb.nku@gmail.com>
There is an empty line between the commit message and the
diff output. Add the graph columns as prefix of this line.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
---
log-tree.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/log-tree.c b/log-tree.c
index d3ae969..2e2be7c 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -469,6 +469,12 @@ int log_tree_diff_flush(struct rev_info *opt)
int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
if ((pch & opt->diffopt.output_format) == pch)
printf("---");
+ if (opt->diffopt.output_prefix) {
+ struct strbuf *msg = NULL;
+ msg = opt->diffopt.output_prefix(&opt->diffopt,
+ opt->diffopt.output_prefix_data);
+ fwrite(msg->buf, msg->len, 1, stdout);
+ }
putchar('\n');
}
}
--
1.6.0.4
next prev parent reply other threads:[~2010-05-21 1:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 1:52 [PATCH 0/6 v3] Make git log --graph looks better with -p and other diff options Bo Yang
2010-05-21 1:52 ` [PATCH 1/6 v3] Add a prefix output callback to diff output Bo Yang
2010-05-21 1:52 ` Bo Yang [this message]
2010-05-21 1:52 ` [PATCH 3/6 v3] diff.c: Output the text graph padding before each diff line Bo Yang
2010-05-21 1:52 ` [PATCH 4/6 v3] Emit a whole line once a time Bo Yang
2010-05-21 1:52 ` [PATCH 5/6 v3] Register a callback for graph output Bo Yang
2010-05-21 1:52 ` [PATCH 6/6 v3] Make --color-words work well with --graph Bo Yang
2010-05-21 3:50 ` [PATCH 0/6 v3] Make git log --graph looks better with -p and other diff options Jeff King
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=1274406764-32278-3-git-send-email-struggleyb.nku@gmail.com \
--to=struggleyb.nku@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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).