X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pretty.c;h=d493cade26890d3e16ea072ced8e0f95679f5670;hb=758df17ab07a58e5b0f8effdf2d1b71fe8d79f1d;hp=8f5bd1ab7f119715564fb13cb74de3937d1a3774;hpb=ff86bdd5cac70850eea4791bea78efa19b228ebe;p=git.git

diff --git a/pretty.c b/pretty.c
index 8f5bd1ab7..d493cade2 100644
--- a/pretty.c
+++ b/pretty.c
@@ -83,7 +83,7 @@ static int get_one_line(const char *msg)
 }
 
 /* High bit set, or ISO-2022-INT */
-int non_ascii(int ch)
+static int non_ascii(int ch)
 {
 	return !isascii(ch) || ch == '\033';
 }
@@ -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);