Notes API: for_each_note(): Traverse the entire notes tree with a callback

diff --git a/pretty.c b/pretty.c
index 8f5bd1ab7f119715564fb13cb74de3937d1a3774..076b918b5234c14f3b6c5ee737a52ba678e714b5 100644 (file)
--- 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';
 }
@@ -775,8 +775,8 @@ 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(commit->object.sha1, sb, git_log_output_encoding ?
+                           git_log_output_encoding : git_commit_encoding, 0);
                return 1;
        }
 
@@ -1094,9 +1094,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(commit->object.sha1, sb, encoding,
+                           NOTES_SHOW_HEADER | NOTES_INDENT);
 
        free(reencoded);
 }