Add flags to get_commit_notes() to control the format of the note string

This patch adds the following flags to get_commit_notes() for adjusting the
format of the produced note string:
- NOTES_SHOW_HEADER: Print "Notes:" line before the notes contents
- NOTES_INDENT: Indent notes contents by 4 spaces

Suggested-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/notes.c b/notes.c
index 2b66723f5fe52b4c32830904748679dd62a3cc47..b7d79e19005f3c384e8e52795746bffdb20d6e67 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -106,7 +106,7 @@ static unsigned char *lookup_notes(const unsigned char *commit_sha1)
 }
 
 void get_commit_notes(const struct commit *commit, struct strbuf *sb,
-               const char *output_encoding)
+               const char *output_encoding, int flags)
 {
        static const char utf8[] = "utf-8";
        unsigned char *sha1;
@@ -148,12 +148,14 @@ void get_commit_notes(const struct commit *commit, struct strbuf *sb,
        if (msglen && msg[msglen - 1] == '\n')
                msglen--;
 
-       strbuf_addstr(sb, "\nNotes:\n");
+       if (flags & NOTES_SHOW_HEADER)
+               strbuf_addstr(sb, "\nNotes:\n");
 
        for (msg_p = msg; msg_p < msg + msglen; msg_p += linelen + 1) {
                linelen = strchrnul(msg_p, '\n') - msg_p;
 
-               strbuf_addstr(sb, "    ");
+               if (flags & NOTES_INDENT)
+                       strbuf_addstr(sb, "    ");
                strbuf_add(sb, msg_p, linelen);
                strbuf_addch(sb, '\n');
        }

diff --git a/notes.h b/notes.h
index 79d21b65f56d2374aed14e58810d1b7c58fafb8a..7f3eed4384208a6cff16aac08d64a9dfb2dafe57 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -1,7 +1,10 @@
 #ifndef NOTES_H
 #define NOTES_H
 
+#define NOTES_SHOW_HEADER 1
+#define NOTES_INDENT 2
+
 void get_commit_notes(const struct commit *commit, struct strbuf *sb,
-               const char *output_encoding);
+               const char *output_encoding, int flags);
 
 #endif

diff --git a/pretty.c b/pretty.c
index e25db81eaa531b97141c2dc3e9246ff3010924ed..01eadd0482f234e2e89ce1e78dbcb1b3a303278e 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -978,7 +978,8 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
                strbuf_addch(sb, '\n');
 
        if (fmt != CMIT_FMT_ONELINE)
-               get_commit_notes(commit, sb, encoding);
+               get_commit_notes(commit, sb, encoding,
+                                NOTES_SHOW_HEADER | NOTES_INDENT);
 
        free(reencoded);
 }