merge-one-file: fix broken merges with alternate work trees

diff --git a/pretty.c b/pretty.c
index 9001379a9dd93818e962ae73cdf85dc178804256..d493cade26890d3e16ea072ced8e0f95679f5670 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1094,7 +1094,7 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
        if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
                strbuf_addch(sb, '\n');
 
-       if (fmt != CMIT_FMT_ONELINE)
+       if (context->show_notes)
                get_commit_notes(commit, sb, encoding,
                                 NOTES_SHOW_HEADER | NOTES_INDENT);