git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bo Yang <struggleyb.nku@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, trast@student.ethz.ch
Subject: [PATCH 3/7] Output the graph columns at the end of the commit message.
Date: Sat, 15 May 2010 04:02:07 -0700	[thread overview]
Message-ID: <1273921331-32702-4-git-send-email-struggleyb.nku@gmail.com> (raw)
In-Reply-To: <1273921331-32702-3-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 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/log-tree.c b/log-tree.c
index d3ae969..1da4ea7 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -469,6 +469,10 @@ 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) {
+				opt->diffopt.output_prefix(opt->diffopt.file,
+					1, opt->diffopt.output_prefix_data);
+			}
 			putchar('\n');
 		}
 	}
-- 
1.7.1.94.gc3269

  reply	other threads:[~2010-05-15 11:02 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-15 11:02 [PATCH 0/7] Make git log --graph looks better with -p and other diff options Bo Yang
2010-05-15 11:02 ` [PATCH 1/7] Add a prefix output callback to diff output Bo Yang
2010-05-15 11:02   ` [PATCH 2/7] Change to call the new emit_line Bo Yang
2010-05-15 11:02     ` Bo Yang [this message]
2010-05-15 11:02       ` [PATCH 4/7] diff.c: Output the text graph padding before each diff line Bo Yang
2010-05-15 11:02         ` [PATCH 5/7] Emit a whole line once a time Bo Yang
2010-05-15 11:02           ` [PATCH 6/7] Register a callback for graph output Bo Yang
2010-05-15 11:02             ` [PATCH 7/7] Make --color-words work well with --graph Bo Yang
2010-05-17  6:59               ` Thomas Rast
2010-05-17  6:57             ` [PATCH 6/7] Register a callback for graph output Thomas Rast
2010-05-17  6:52         ` [PATCH 4/7] diff.c: Output the text graph padding before each diff line Thomas Rast
2010-05-17  6:45     ` [PATCH 2/7] Change to call the new emit_line Thomas Rast

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=1273921331-32702-4-git-send-email-struggleyb.nku@gmail.com \
    --to=struggleyb.nku@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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).