X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=pretty.c;h=f999485a54acdb63c699ee1fce00f80433889e81;hb=6ceeaee7ea5bb754c76ce93c5b289f72d69fdb92;hp=9001379a9dd93818e962ae73cdf85dc178804256;hpb=0877510ad4e8b951b08f9cbb25cfc0d994468979;p=git.git

diff --git a/pretty.c b/pretty.c
index 9001379a9..f999485a5 100644
--- a/pretty.c
+++ b/pretty.c
@@ -775,8 +775,9 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
 		}
 		return 0;	/* unknown %g placeholder */
 	case 'N':
-		get_commit_notes(commit, sb, git_log_output_encoding ?
-			     git_log_output_encoding : git_commit_encoding, 0);
+		format_note(NULL, commit->object.sha1, sb,
+			    git_log_output_encoding ? git_log_output_encoding
+						    : git_commit_encoding, 0);
 		return 1;
 	}
 
@@ -1094,9 +1095,9 @@ 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)
-		get_commit_notes(commit, sb, encoding,
-				 NOTES_SHOW_HEADER | NOTES_INDENT);
+	if (context->show_notes)
+		format_note(NULL, commit->object.sha1, sb, encoding,
+			    NOTES_SHOW_HEADER | NOTES_INDENT);
 
 	free(reencoded);
 }