Commit 304cc11c authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

notes: refactor display notes extra refs field

There's no need to use an extra pointer, which just ends up
leaking memory. The fact that the list is empty tells us the
same thing.
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent c063f0a9
......@@ -1066,9 +1066,9 @@ void init_display_notes(struct display_notes_opt *opt)
git_config(notes_display_config, &load_config_refs);
if (opt && opt->extra_notes_refs) {
if (opt) {
struct string_list_item *item;
for_each_string_list_item(item, opt->extra_notes_refs)
for_each_string_list_item(item, &opt->extra_notes_refs)
string_list_add_refs_by_glob(&display_notes_refs,
item->string);
}
......
#ifndef NOTES_H
#define NOTES_H
#include "string-list.h"
/*
* Function type for combining two notes annotating the same object.
*
......@@ -257,7 +259,7 @@ struct string_list;
struct display_notes_opt {
unsigned int suppress_default_notes:1;
struct string_list *extra_notes_refs;
struct string_list extra_notes_refs;
};
/*
......
......@@ -1372,11 +1372,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
struct strbuf buf = STRBUF_INIT;
revs->show_notes = 1;
revs->show_notes_given = 1;
if (!revs->notes_opt.extra_notes_refs)
revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
strbuf_addstr(&buf, arg+13);
expand_notes_ref(&buf);
string_list_append(revs->notes_opt.extra_notes_refs,
string_list_append(&revs->notes_opt.extra_notes_refs,
strbuf_detach(&buf, NULL));
} else if (!strcmp(arg, "--no-notes")) {
revs->show_notes = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment