log: teach "terminator" vs "separator" mode to "--pretty=format"

[thirdparty/git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index 9d54061601c2b378089a88142138ce3e0da1761e..8f5436b747830cc3e91d862efc3cbcb30fab65ae 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -249,9 +249,9 @@ void show_log(struct rev_info *opt, const char *sep)
         *    not have an empty line between entries.
         */
        extra = "";
-       if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
+       if (*sep != '\n' && opt->use_terminator)
                extra = "\n";
-       if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
+       if (opt->shown_one && !opt->use_terminator)
                putchar(opt->diffopt.line_termination);
        opt->shown_one = 1;