diff options
author | Denton Liu <liu.denton@gmail.com> | 2019-12-09 16:10:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 00:36:44 +0300 |
commit | e6e230eeae0f3cb46c4c356e6cd0a0f1119a2a83 (patch) | |
tree | 0234ae345c7d5255f6d3fc5b41d79c485de100f2 | |
parent | 1e6ed5441a61b5085978e0429691e2e2425f6846 (diff) |
notes: create init_display_notes() helper
We currently open code the initialization for revs->notes_opt. Abstract
this away into a helper function so that the logic can be reused in a
future commit.
This is slightly wasteful as we memset the struct twice but this is only
run once so it shouldn't have any major effect.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | notes.c | 6 | ||||
-rw-r--r-- | notes.h | 5 | ||||
-rw-r--r-- | revision.c | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1039,6 +1039,12 @@ struct notes_tree **load_notes_trees(struct string_list *refs, int flags) return trees; } +void init_display_notes(struct display_notes_opt *opt) +{ + memset(opt, 0, sizeof(*opt)); + opt->use_default_notes = -1; +} + void load_display_notes(struct display_notes_opt *opt) { char *display_ref_env; @@ -261,6 +261,11 @@ struct display_notes_opt { }; /* + * Initialize a display_notes_opt to its default value. + */ +void init_display_notes(struct display_notes_opt *opt); + +/* * Load the notes machinery for displaying several notes trees. * * If 'opt' is not NULL, then it specifies additional settings for the diff --git a/revision.c b/revision.c index d4aaf0ef25..24ad974590 100644 --- a/revision.c +++ b/revision.c @@ -1637,7 +1637,7 @@ void repo_init_revisions(struct repository *r, revs->diffopt.prefix_length = strlen(prefix); } - revs->notes_opt.use_default_notes = -1; + init_display_notes(&revs->notes_opt); } static void add_pending_commit_list(struct rev_info *revs, |