undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notes: refactor display notes extra refs field

Browse Source 
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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-03-29 16:56:53 -04:00 committed by Junio C Hamano
parent c063f0a973
commit 304cc11c65
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notes.c
View File

@ -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);
}

4
notes.h
View File

@ -1,6 +1,8 @@
#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;
};
/*

4
revision.c
View File

@ -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;