[PATCH v2 1/4] notes: convert raw arg in format_display_notes() to bool
From: Siddh Raman Pant <hidden>
Date: 2026-05-22 16:10:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
It's used as a boolean flag, let's not use an int. Signed-off-by: Siddh Raman Pant <redacted> --- log-tree.c | 3 +-- notes.c | 6 +++--- notes.h | 2 +- revision.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/log-tree.c b/log-tree.c
index 7e048701d0c5..4503a42dde6b 100644
--- a/log-tree.c
+++ b/log-tree.c@@ -854,10 +854,9 @@ void show_log(struct rev_info *opt) } if (opt->show_notes) { - int raw; struct strbuf notebuf = STRBUF_INIT; + bool raw = (opt->commit_format == CMIT_FMT_USERFORMAT); - raw = (opt->commit_format == CMIT_FMT_USERFORMAT); format_display_notes(&commit->object.oid, ¬ebuf, get_log_output_encoding(), raw); ctx.notes_message = strbuf_detach(¬ebuf, NULL);
diff --git a/notes.c b/notes.c
index 8f315e2a00d2..201f1df3dc29 100644
--- a/notes.c
+++ b/notes.c@@ -1273,11 +1273,11 @@ void free_notes(struct notes_tree *t) * If the given notes_tree is NULL, the internal/default notes_tree will be * used instead. * - * (raw != 0) gives the %N userformat; otherwise, the note message is given + * (raw == true) gives the %N userformat; otherwise, the note message is given * for human consumption. */ static void format_note(struct notes_tree *t, const struct object_id *object_oid, - struct strbuf *sb, const char *output_encoding, int raw) + struct strbuf *sb, const char *output_encoding, bool raw) { static const char utf8[] = "utf-8"; const struct object_id *oid;
@@ -1338,7 +1338,7 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid } void format_display_notes(const struct object_id *object_oid, - struct strbuf *sb, const char *output_encoding, int raw) + struct strbuf *sb, const char *output_encoding, bool raw) { int i; assert(display_notes_trees);
diff --git a/notes.h b/notes.h
index 6dc6d7b26548..f6410b31e1c9 100644
--- a/notes.h
+++ b/notes.h@@ -313,7 +313,7 @@ void load_display_notes(struct display_notes_opt *opt); * You *must* call load_display_notes() before using this function. */ void format_display_notes(const struct object_id *object_oid, - struct strbuf *sb, const char *output_encoding, int raw); + struct strbuf *sb, const char *output_encoding, bool raw); /* * Load the notes tree from each ref listed in 'refs'. The output is
diff --git a/revision.c b/revision.c
index 599b3a66c369..cd9fcefa0a88 100644
--- a/revision.c
+++ b/revision.c@@ -4107,7 +4107,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt) if (opt->show_notes) { if (!buf.len) strbuf_addstr(&buf, message); - format_display_notes(&commit->object.oid, &buf, encoding, 1); + format_display_notes(&commit->object.oid, &buf, encoding, true); } /*
--
2.53.0