summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-07 13:29:01 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-07 13:29:01 -0700
commit43d1e41ea91ba95b902f549274916660bf520b98 (patch)
treece1dfff3b4ae0c58854cfd280fceb9b5822587cc /log-tree.c
parentcae097722162c852ab81c50efe8b25a84b6a5dff (diff)
parentfafd38299bb6ff5634de89bcca35f622005d0279 (diff)
downloadgit-43d1e41ea91ba95b902f549274916660bf520b98.tar.gz
Merge branch 'jk/maint-tformat-with-z'
"log -z --pretty=tformat:..." does not terminate each record with NUL and this is a beginning of an attempt to fix it. It still is not right but the patch does not make externally observable behaviour worse. By Jan Krüger (1) and Junio C Hamano (1) * jk/maint-tformat-with-z: log-tree: the previous one is still not quite right log-tree: use custom line terminator in line termination mode
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 34c49e7b33..44f0268372 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);