Merge branch 'as/log-output-encoding-in-user-format'

diff --git a/log-tree.c b/log-tree.c
index 5277d3e8d08f492f0bbc1f68fcc39f77106867ad..60f32a3965feeba30bd7ba7ba724c5d7dfd52be8 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -10,6 +10,7 @@
 #include "color.h"
 #include "gpg-interface.h"
 #include "sequencer.h"
+#include "line-log.h"
 
 struct decoration name_decoration = { "object names" };
 
@@ -797,6 +798,9 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
        log.parent = NULL;
        opt->loginfo = &log;
 
+       if (opt->line_level_traverse)
+               return line_log_print(opt, commit);
+
        shown = log_tree_diff(opt, commit, &log);
        if (!shown && opt->loginfo && opt->always_show_header) {
                log.parent = NULL;