summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-03-29 16:57:27 -0400
committerJunio C Hamano <gitster@pobox.com>2011-03-29 14:31:59 -0700
commit3a03cf6b1d1cf5d05edec1781446a26782eaff09 (patch)
tree3b1e226b602b44680576bb4cf099a61bafa00884 /notes.c
parent304cc11c6566cf22e811aa791988c61b6d291973 (diff)
downloadgit-3a03cf6b1d1cf5d05edec1781446a26782eaff09.tar.gz
notes: refactor display notes default handling
This is in preparation for more notes-related revision command-line options. The "suppress_default_notes" option is renamed to "use_default_notes", and is now a tri-state with values less than one indicating "not set". If the value is "not set", then we show default refs if and only if no other refs were given. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index 2ec604c1db..f6ce8489d3 100644
--- a/notes.c
+++ b/notes.c
@@ -1053,7 +1053,8 @@ void init_display_notes(struct display_notes_opt *opt)
assert(!display_notes_trees);
- if (!opt || !opt->suppress_default_notes) {
+ if (!opt || opt->use_default_notes > 0 ||
+ (opt->use_default_notes == -1 && !opt->extra_notes_refs.nr)) {
string_list_append(&display_notes_refs, default_notes_ref());
display_ref_env = getenv(GIT_NOTES_DISPLAY_REF_ENVIRONMENT);
if (display_ref_env) {