kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

notes: convert format_display_notes to struct object_id 

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2017-05-30 10:30:41 -07:00 committed by Junio C Hamano
parent 9ef7223058
commit fb61e4d3ab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log-tree.c
View File

@ -655,7 +655,7 @@ void show_log(struct rev_info *opt)
struct strbuf notebuf = STRBUF_INIT; struct strbuf notebuf = STRBUF_INIT;


raw = (opt->commit_format == CMIT_FMT_USERFORMAT); raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
format_display_notes(commit->object.oid.hash, &notebuf, format_display_notes(&commit->object.oid, &notebuf,
get_log_output_encoding(), raw); get_log_output_encoding(), raw);
ctx.notes_message = notebuf.len ctx.notes_message = notebuf.len
? strbuf_detach(&notebuf, NULL) ? strbuf_detach(&notebuf, NULL)

8
notes.c
View File

@ -1215,7 +1215,7 @@ void free_notes(struct notes_tree *t)
* (raw != 0) gives the %N userformat; otherwise, the note message is given * (raw != 0) gives the %N userformat; otherwise, the note message is given
* for human consumption. * for human consumption.
*/ */
static void format_note(struct notes_tree *t, const unsigned char *object_sha1, 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, int raw)
{ {
static const char utf8[] = "utf-8"; static const char utf8[] = "utf-8";
@ -1229,7 +1229,7 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
if (!t->initialized) if (!t->initialized)
init_notes(t, NULL, NULL, 0); init_notes(t, NULL, NULL, 0);


oid = get_note(t, object_sha1); oid = get_note(t, object_oid->hash);
if (!oid) if (!oid)
return; return;


@ -1277,13 +1277,13 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
free(msg); free(msg);
} }


void format_display_notes(const unsigned char *object_sha1, 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, int raw)
{ {
int i; int i;
assert(display_notes_trees); assert(display_notes_trees);
for (i = 0; display_notes_trees[i]; i++) for (i = 0; display_notes_trees[i]; i++)
format_note(display_notes_trees[i], object_sha1, sb, format_note(display_notes_trees[i], object_oid, sb,
output_encoding, raw); output_encoding, raw);
} }



2
notes.h
View File

@ -277,7 +277,7 @@ void init_display_notes(struct display_notes_opt *opt);
* *
* You *must* call init_display_notes() before using this function. * You *must* call init_display_notes() before using this function.
*/ */
void format_display_notes(const unsigned char *object_sha1, 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, int raw);


/* /*

2
revision.c
View File

@ -2908,7 +2908,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
if (opt->show_notes) { if (opt->show_notes) {
if (!buf.len) if (!buf.len)
strbuf_addstr(&buf, message); strbuf_addstr(&buf, message);
format_display_notes(commit->object.oid.hash, &buf, encoding, 1); format_display_notes(&commit->object.oid, &buf, encoding, 1);
} }


/* /*