git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jan Krüger" <jk@jk.gs>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Randal L. Schwartz" <merlyn@stonehenge.com>, git@vger.kernel.org
Subject: [PATCH v2] log-tree: use custom line terminator in line termination mode
Date: Mon, 30 Apr 2012 22:28:25 +0200	[thread overview]
Message-ID: <1335817705-24718-1-git-send-email-jk@jk.gs> (raw)
In-Reply-To: <7vaa1tf1w8.fsf@alter.siamese.dyndns.org>

When using a custom format in line termination mode (as opposed to line
separation mode), the configured line terminator is not used, so things
like "git log --pretty=tformat:%H -z" do not work properly.

Make it use the line terminator the user ordered.

Signed-off-by: Jan Krüger <jk@jk.gs>
---
 Here are two simple tests, for both format: and tformat: with -z.

 log-tree.c                    |    2 +-
 t/t4205-log-pretty-formats.sh |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/log-tree.c b/log-tree.c
index 34c49e7..44f0268 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -682,7 +682,7 @@ void show_log(struct rev_info *opt)
 	if (opt->use_terminator) {
 		if (!opt->missing_newline)
 			graph_show_padding(opt->graph);
-		putchar('\n');
+		putchar(opt->diffopt.line_termination);
 	}
 
 	strbuf_release(&msgbuf);
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 2ae9faa..03a73ba 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -71,4 +71,16 @@ test_expect_success 'alias loop' '
 	test_must_fail git log --pretty=test-foo
 '
 
+printf "add bar\0initial" > expected
+test_expect_success 'NUL separation' '
+	git log -z --pretty="format:%s" >actual &&
+	test_cmp expected actual
+'
+
+printf "add bar\0initial\0" > expected
+test_expect_success 'NUL termination' '
+	git log -z --pretty="tformat:%s" >actual &&
+	test_cmp expected actual
+'
+
 test_done
-- 
1.7.10.406.g0017

  reply	other threads:[~2012-04-30 20:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-30 17:58 git log -z still outputting newlines? Randal L. Schwartz
2012-04-30 18:34 ` Andreas Schwab
2012-04-30 19:02   ` Thomas Rast
2012-04-30 18:45 ` [PATCH] log-tree: use custom line terminator in line termination mode Jan Krüger
2012-04-30 19:36   ` Junio C Hamano
2012-04-30 20:28     ` Jan Krüger [this message]
2012-04-30 22:58       ` [PATCH v2] " Junio C Hamano
2012-04-30 23:28         ` Jan Krüger
2012-05-01  0:28         ` Andreas Schwab
2012-05-01  0:43           ` Junio C Hamano
2012-05-01  7:29             ` Andreas Schwab
2012-05-01  2:51         ` Randal L. Schwartz
2012-05-01  4:27           ` Junio C Hamano
2012-05-01  8:56     ` [PATCH] " Jeff King
2012-05-01 16:12       ` Junio C Hamano
2012-05-01 17:06         ` Junio C Hamano
2012-05-01 20:03           ` 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=1335817705-24718-1-git-send-email-jk@jk.gs \
    --to=jk@jk.gs \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=merlyn@stonehenge.com \
    /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).